Prepping QML/CA UI factory

malachi-iot · Jul 17, 2024 · 6b3174a · 6b3174a
1 parent 2b45d3b
commit 6b3174a
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 7 deletions.
diff --git a/test/qt/lib/CAContainer.qml b/test/qt/lib/CAContainer.qml
@@ -12,6 +12,7 @@ GridLayout {
     id: root
     // List of 'ControllerApplication'
     property var model
+    required property Runtime runtime
 
     columns: 2
     flow: GridLayout.TopToBottom

diff --git a/test/qt/lib/include/j1939/qt/plugin.h b/test/qt/lib/include/j1939/qt/plugin.h
@@ -8,12 +8,14 @@
 #include <j1939/NAME/industry_groups.h>
 #include <j1939/pgn/enum.h>
 
+#include "runtime.h"
+
 namespace embr::j1939::qt { inline namespace v1 {
 
 class Plugin
 {
 public:
-    static void init();
+    static void init(Runtime*);
 };
 
 // Guidance from

diff --git a/test/qt/lib/include/j1939/qt/runtime.h b/test/qt/lib/include/j1939/qt/runtime.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QHash>
 #include <QObject>
 #include <QQmlEngine>
 #include <QQuickItem>
@@ -9,14 +10,20 @@ namespace embr::j1939::qt { inline namespace v1 {
 
 class QmlFactory : public QObject
 {
+    QHash<const QMetaObject*, QQmlComponent*> mapping_;
     QQmlEngine* engine_;
 
     Q_OBJECT
 
 public:
-    QmlFactory(QQmlEngine* parent = nullptr) : QObject(parent) {}
+    QmlFactory(QQmlEngine* parent) :
+        QObject(parent),
+        engine_(parent)
+    {}
+
+    Q_INVOKABLE QQuickItem* create(const QObject*);
 
-    Q_INVOKABLE QQuickItem* create();
+    void map(const QMetaObject* key, const QString& qmlFile);
 };
 
 class Runtime : public QObject

diff --git a/test/qt/lib/include/j1939/qt/session.h b/test/qt/lib/include/j1939/qt/session.h
@@ -2,6 +2,7 @@
 
 #include <QObject>
 #include <QCanBusDevice>
+#include <QQuickItem>
 
 #include "cs/generic.h"
 #include "cs/network.h"
@@ -48,6 +49,8 @@ class Session : public QObject
     QList<cs_type>& clients() { return css_; }
     QList<const QObject*> frameLog() const { return frameLog_; }
 
+    Q_INVOKABLE QQuickItem* createQmlFromCa(QObject*);
+
 signals:
     void frameLogChanged();
 };

diff --git a/test/qt/lib/plugin.cpp b/test/qt/lib/plugin.cpp
@@ -18,8 +18,9 @@
 
 namespace embr::j1939::qt { inline namespace v1 {
 
-void Plugin::init()
+void Plugin::init(Runtime* runtime)
 {
+    qmlRegisterType<embr::j1939::qt::v1::Runtime>("j1939", 1, 0, "Runtime");
     qmlRegisterType<embr::j1939::qt::DataField>("j1939", 1, 0, "DataField");
     qmlRegisterType<embr::j1939::qt::v1::Pdu>("j1939", 1, 0, "Pdu");
     // DEBT: Unclear what the major difference between this and qmlRegisterInterface is

diff --git a/test/qt/lib/runtime.cpp b/test/qt/lib/runtime.cpp
@@ -1,14 +1,35 @@
+#include <QQmlContext>
+
 #include "j1939/qt/runtime.h"
 
 // Guidance from
 // https://stackoverflow.com/questions/66618613/qml-c-classes-with-bring-your-own-component
 
 namespace embr::j1939::qt { inline namespace v1 {
 
-QQuickItem* QmlFactory::create()
+QQuickItem* QmlFactory::create(const QObject* o)
 {
+    const QMetaObject* meta = o->metaObject();
+    auto i = mapping_.find(meta);
+
+    if(i != mapping_.end())
+    {
+        QQmlContext* context = new QQmlContext(engine_);
+        QObject* created = i.value()->create(context);
+        auto item = dynamic_cast<QQuickItem*>(created);
+        return item;
+    }
+
     return nullptr;
     //return {};
 }
 
+void QmlFactory::map(const QMetaObject* key, const QString& qmlFile)
+{
+    // DEBT: Does this auto-free if reassigned?
+    QUrl url = QUrl::fromLocalFile(qmlFile);
+    auto component = new QQmlComponent(engine_, url, this);
+    mapping_[key] = component;
+}
+
 }}
diff --git a/test/qt/lib/session.cpp b/test/qt/lib/session.cpp
@@ -64,4 +64,10 @@ void Session::setDevice(QCanBusDevice* device)
     }); */
 }
 
+
+QQuickItem* Session::createQmlFromCa(QObject* o)
+{
+    return runtime_->caQmlFactory()->create(o);
+}
+
 }}
diff --git a/test/qt/oel/Main.qml b/test/qt/oel/Main.qml
@@ -35,6 +35,7 @@ Window {
 
         CAContainer {
             model: Session.clients
+            runtime: Session.runtime
         }
 
         RowLayout {

diff --git a/test/qt/oel/main.cpp b/test/qt/oel/main.cpp
@@ -28,9 +28,10 @@ int main(int argc, char *argv[])
         Qt::QueuedConnection
     );
 
-    j1939::qt::Plugin::init();
-
     auto runtime = new j1939::qt::Runtime(&engine);
+
+    j1939::qt::Plugin::init(runtime);
+
     auto session = new j1939::qt::Session(runtime);
 
     auto oel = new j1939::qt::ca::OEL(session);
@@ -41,6 +42,10 @@ int main(int argc, char *argv[])
     session->clients().push_back(lcmd);
     session->clients().push_back(ccvs);
 
+
+    runtime->caQmlFactory()->map(
+        &j1939::qt::ca::v1::CCVS::staticMetaObject, "oel/CCVS.qml");
+
     qmlRegisterSingletonInstance("j1939", 1, 0, "Session", session);
 
     engine.rootContext()->setContextObject(new embr::j1939::qt::v1::API(&app));
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,4 +64,10 @@ void Session::setDevice(QCanBusDevice* device) @@
         }); */
     }
+    QQuickItem* Session::createQmlFromCa(QObject* o)
+    {
+        return runtime_->caQmlFactory()->create(o);
+    }
     }}