From 54e2ad06b87f244e5c7920f54b407de35ae903c3 Mon Sep 17 00:00:00 2001 From: samcake Date: Mon, 2 Apr 2018 17:59:28 -0700 Subject: [PATCH] GOing over the jet lib ui and the nightmare that is the js/qml family --- libraries/task/src/task/Config.cpp | 2 - libraries/task/src/task/Config.h | 19 +-- .../developer/utilities/lib/jet/TaskList.qml | 133 +++--------------- scripts/developer/utilities/lib/jet/jet.js | 105 ++++---------- .../developer/utilities/lib/jet/jet_qml.js | 72 ---------- .../utilities/workload/inspectEngine.js | 14 +- .../developer/utilities/workload/workload.js | 2 +- .../{workload.qml => workloadInspector.qml} | 13 +- 8 files changed, 69 insertions(+), 291 deletions(-) delete mode 100644 scripts/developer/utilities/lib/jet/jet_qml.js rename scripts/developer/utilities/workload/{workload.qml => workloadInspector.qml} (93%) diff --git a/libraries/task/src/task/Config.cpp b/libraries/task/src/task/Config.cpp index b63165adbe..b378237c9c 100644 --- a/libraries/task/src/task/Config.cpp +++ b/libraries/task/src/task/Config.cpp @@ -18,8 +18,6 @@ using namespace task; -int nakedJobConfigPointerTypeId = qRegisterMetaType(); - void JobConfig::setPresetList(const QJsonObject& object) { for (auto it = object.begin(); it != object.end(); it++) { JobConfig* child = findChild(it.key(), Qt::FindDirectChildrenOnly); diff --git a/libraries/task/src/task/Config.h b/libraries/task/src/task/Config.h index adb8a60c8e..8548812d65 100644 --- a/libraries/task/src/task/Config.h +++ b/libraries/task/src/task/Config.h @@ -92,10 +92,8 @@ class JobConfig : public QObject { double _msCPURunTime{ 0.0 }; public: using Persistent = PersistentConfig; - using QConfigList = QList; JobConfig() = default; - // JobConfig(const JobConfig& src) = default; JobConfig(bool enabled) : alwaysEnabled{ false }, enabled{ enabled } {} bool isEnabled() { return alwaysEnabled || enabled; } @@ -110,15 +108,17 @@ public: Q_INVOKABLE QString toJSON() { return QJsonDocument(toJsonValue(*this).toObject()).toJson(QJsonDocument::Compact); } Q_INVOKABLE void load(const QVariantMap& map) { qObjectFromJsonValue(QJsonObject::fromVariantMap(map), *this); emit loaded(); } + Q_INVOKABLE QObject* getConfig(const QString& name) { return nullptr; } + // Running Time measurement // The new stats signal is emitted once per run time of a job when stats (cpu runtime) are updated void setCPURunTime(double mstime) { _msCPURunTime = mstime; emit newStats(); } double getCPURunTime() const { return _msCPURunTime; } Q_INVOKABLE virtual bool isTask() const { return false; } - Q_INVOKABLE virtual QConfigList getSubConfigs() const { return QConfigList(); } + Q_INVOKABLE virtual QObjectList getSubConfigs() const { return QObjectList(); } Q_INVOKABLE virtual int getNumSubs() const { return 0; } - Q_INVOKABLE virtual JobConfig* getSubConfig(int i) const { return nullptr; } + Q_INVOKABLE virtual QObject* getSubConfig(int i) const { return nullptr; } public slots: void load(const QJsonObject& val) { qObjectFromJsonValue(val, *this); emit loaded(); } @@ -139,12 +139,9 @@ public: class TaskConfig : public JobConfig { Q_OBJECT public: - using QConfigList = QList; - using Persistent = PersistentConfig; TaskConfig() = default; - // TaskConfig(const TaskConfig& src) = default; TaskConfig(bool enabled) : JobConfig(enabled) {} @@ -182,9 +179,9 @@ public: } Q_INVOKABLE bool isTask() const override { return true; } - Q_INVOKABLE QConfigList getSubConfigs() const override { + Q_INVOKABLE QObjectList getSubConfigs() const override { auto list = findChildren(QRegExp(".*"), Qt::FindDirectChildrenOnly); - QConfigList returned; + QObjectList returned; for (int i = 0; i < list.size(); i++) { returned.push_back(list[i]); } @@ -192,7 +189,7 @@ public: } Q_INVOKABLE int getNumSubs() const override { return getSubConfigs().size(); } - Q_INVOKABLE JobConfig* getSubConfig(int i) const override { + Q_INVOKABLE QObject* getSubConfig(int i) const override { auto subs = getSubConfigs(); return ((i < 0 || i >= subs.size()) ? nullptr : subs[i] ); } @@ -208,6 +205,4 @@ public slots: } -Q_DECLARE_METATYPE(task::JobConfig*); - #endif // hifi_task_Config_h diff --git a/scripts/developer/utilities/lib/jet/TaskList.qml b/scripts/developer/utilities/lib/jet/TaskList.qml index 04e6184fc0..baa579b4a3 100644 --- a/scripts/developer/utilities/lib/jet/TaskList.qml +++ b/scripts/developer/utilities/lib/jet/TaskList.qml @@ -8,28 +8,33 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +import QtQuick 2.7 +import QtQuick.Controls 1.4 as Original +import QtQuick.Controls.Styles 1.4 + +import "qrc:///qml/styles-uit" +import "qrc:///qml/controls-uit" as HifiControls + //import QtQuick 2.7 //import QtQuick.Controls 1.4 as Original //import QtQuick.Controls.Styles 1.4 -import QtQuick 2.5 -import QtQuick.Controls 1.4 +//import QtQuick 2.5 +//import QtQuick.Controls 1.4 //import Hifi 1.0 as Hifi //import "qrc:///qml/styles-uit" //import "qrc:///qml/controls-uit" as HifiControls -import "jet_qml.js" as Jet +import "jet.js" as Jet Rectangle { id: root - width: parent ? parent.width : 100 - height: parent ? parent.height : 100 - property var config + width: parent ? parent.width : 200 + height: parent ? parent.height : 400 + property var rootConfig - property var renderConfig : Render - - TextArea { + Original.TextArea { id: textArea width: parent.width height: parent.height @@ -37,114 +42,18 @@ Rectangle { } Component.onCompleted: { - // Connect the signal from Selection when any selection content change and use it to refresh the current selection view - // Selection.selectedItemsListChanged.connect(resetSelectionView) - var message = "On Completed: \n" - var functor = Jet.job_print_functor(function (line) { message += line + "\n"; }); - // Jet.task_traverseTree(Render, functor); - var lroot = Workload; - functor(lroot,0,0) - // message += Workload["getSubConfigs"]() + '\n' - - //var subs = Workload; - message += " subs size = " + lroot.getNumSubs() - for (var i = 0; i < lroot.getNumSubs(); i++) { - if (functor(lroot.getSubConfig(i), depth, i)) { - // task_traverse(subs[i], functor, depth) - } - } + var message = "" + var functor = Jet.job_print_functor(function (line) { message += line + "\n"; }); + Jet.task_traverseTree(Workload, functor); textArea.append(message); } function fromScript(mope) { - //print(message) - //var message = mope + '\n'; - var message ='\n'; - - // Jet.task_traverseTree(Render, Jet.job_print_functor(function (line) { message += line + "\n"; }) ); - /* - - Render.findChildren();*/ - - // message += (Render.getSubConfigs()) - // Render.getConfig("").findChildren(); -/**//* - var job = Render; - message +=(job.objectName + " " + (job.enabled ? "on" : "off")) + '\n'; - var keys = Jet.job_propKeys(job); - for (var p=0; p < keys.length;p++) { - var prop = job[keys[p]] - message += (typeof prop + " " + keys[p] + " " + prop) + '\n'; - }*/ -/* -function task_traverse(root, functor, depth) { - if (root.isTask()) { - var subs = root.getSubConfigs() - depth++; - for (var i = 0; i