GOing over the jet lib ui and the nightmare that is the js/qml family

libraries/task/src/task/Config.cpp

@@ -18,8 +18,6 @@
 
 using namespace task;
 
-int nakedJobConfigPointerTypeId = qRegisterMetaType<JobConfig*>();
-
 void JobConfig::setPresetList(const QJsonObject& object) {
     for (auto it = object.begin(); it != object.end(); it++) {
         JobConfig* child = findChild<JobConfig*>(it.key(), Qt::FindDirectChildrenOnly);

libraries/task/src/task/Config.h

@@ -92,10 +92,8 @@ class JobConfig : public QObject {
         double _msCPURunTime{ 0.0 };
 public:
     using Persistent = PersistentConfig<JobConfig>;
-    using QConfigList = QList<JobConfig*>;
 
     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<JobConfig*>;
-
     using Persistent = PersistentConfig<TaskConfig>;
 
     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<JobConfig*>(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

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 2.5
-import QtQuick.Controls 1.4
+//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
+    width: parent ? parent.width : 200
-    height: parent ? parent.height : 100
+    height: parent ? parent.height : 400
-    property var config
+    property var rootConfig
 
-    property var renderConfig : Render
+    Original.TextArea {
-
-    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
+        var message = ""
-       // 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);
+        Jet.task_traverseTree(Workload, 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)
-            }
-        }
         textArea.append(message);
      }
     function fromScript(mope) {
-        //print(message)
+        var message ='Received \n';
-        //var message = mope + '\n';
+        message += mope;
-        var message ='\n';
+        textArea.append(message);
-        
-      //  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 <subs.length; i++) {
-            if (functor(subs[i], depth, i)) {
-                task_traverse(subs[i], functor, depth)
-            }
-        }
-    }    
-}*/
-     /*   var functor = Jet.job_print_functor(function (line) { message += line + "\n"; });
-       // Jet.task_traverseTree(Render, functor);
-        var lroot = Jet.getRender().getConfig("UpdateScene");
-        functor(lroot,0,0)
-        var subs = lroot.getSubConfigs()
-        message += " subs size =  " + subs.length
-        for (var i = 0; i <subs.length; i++) {
-            if (functor(subs[i], depth, i)) {
-             //   task_traverse(subs[i], functor, depth)
-            }
-        }
-       // message += Render.getSubConfigs()
-   /*    var subs = root.getSubConfigs()
-        depth++;
-        for (var i = 0; i <subs.length; i++) {
-            if (functor(subs[i], depth, i)) {
-                task_traverse(subs[i], functor, depth)
-            }
-        }
-   // }    
-}*/     
-        /*var depth = 0;
-        if (functor(lroot, 0, 0)) {
-            var subs = lroot.getSubConfigs()
-            depth++;
-            for (var i = 0; i <subs.length; i++) {
-              //  message += JSON.stringify(subs[i]);
-         
-                if (functor(subs[i], depth, i)) {
-                   // task_traverse(subs[i], functor, depth)
-                }
-            }
-        } */
-     //   Jet.task_traverseTree(Render, functor)
-
-     //   message = genTree();
-       // print(message);
     }
 
     function clearWindow() {
         textArea.remove(0,textArea.length);
     }
 }
-/*
-Item {
-    HifiConstants { id: hifi;}
-    id: render;   
-    anchors.margins: hifi.dimensions.contentMargin.x
-    
-    color: hifi.colors.baseGray;   
-    Column {
-        spacing: 5
-        anchors.left: parent.left
-        anchors.right: parent.right       
-        anchors.margins: hifi.dimensions.contentMargin.x  
-        //padding: hifi.dimensions.contentMargin.x
-        HifiControls.Label {
-                    text: "Shading"       
-        }
-    }
-}*/

scripts/developer/utilities/lib/jet/jet.js

@@ -9,27 +9,28 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 "use strict";
-/*function Jet() {
-};
-Jet.prototype = {
-    // traverse task tree
-    task_traverse: function(root, functor, depth) {
-        var subs = root.findChildren(/.*//*)
-        depth++;
-        for (var i = 0; i <subs.length; i++) {
-            if (functor(subs[i], depth, i)) {
-                this.task_traverse(subs[i], functor, depth)
-            }
-        }    
-    },   
-    task_traverseTree: function(root, functor) {
-        if (functor(root, 0, 0)) {
-            this.task_traverse(root, functor, 0)
-        } 
-    },
 
-    // Access job properties
+ // traverse task tree
-    job_propKeys: function(job) {
+function task_traverse(root, functor, depth) {
+   // if (root.isTask()) { 
+        depth++;
+        for (var i = 0; i <root.getNumSubs(); i++) {
+            var sub = root.getSubConfig(i);
+            if (functor(sub, depth, i)) {
+                task_traverse(sub, functor, depth)
+            }
+        }
+   // }    
+}
+function task_traverseTree(root, functor) {
+    if (functor(root, 0, 0)) {
+        task_traverse(root, functor, 0)
+    }   
+}
+
+// Access job properties
+// return all the properties of a job
+function job_propKeys(job) {
     var keys = Object.keys(job)
     var propKeys = [];
     for (var k=0; k < keys.length;k++) {
@@ -42,63 +43,10 @@ Jet.prototype = {
         }
     }   
     return propKeys; 
-    }
-};
-
-jet = Jet();
-
-// Functors
-jet.job_print_functor = function (printout, maxDepth) {
-    if (maxDepth === undefined) maxDepth = 100
-    return function (job, depth, index) {
-        var tab = "    "
-        var depthTab = "";
-        for (var d = 0; d < depth; d++) { depthTab += tab }
-        printout(depthTab + index + " " + job.objectName + " " + (job.enabled ? "on" : "off")) 
-        var keys = jet.job_propKeys(job);
-        for (var p=0; p < keys.length;p++) {
-            var prop = job[keys[p]]
-            printout(depthTab + tab + tab + typeof prop + " " + keys[p] + " " + prop);
-        }
-
-        return depth < maxDepth;
-    }
-} 
-*/
- // traverse task tree
-task_traverse = function (root, functor, depth) {
-    //if (root.isTask()) { 
-        var subs = root.getSubConfigs()
-        depth++;
-        for (var i = 0; i <subs.length; i++) {
-            if (functor(subs[i], depth, i)) {
-                task_traverse(subs[i], functor, depth)
-            }
-        }
-   // }    
-}
-task_traverseTree = function (root, functor) {
-    if (functor(root, 0, 0)) {
-        task_traverse(root, functor, 0)
-    }   
 }
 
-// Access job properties
+// Use this function to create a functor that will print the content of the Job visited calling the  specified 'printout' function
-job_propKeys = function (job) {
+function job_print_functor(printout, maxDepth) {
-var keys = Object.keys(job)
-var propKeys = [];
-for (var k=0; k < keys.length;k++) {
-    // Filter for relevant property
-    var key = keys[k]
-    if ((typeof job[key]) !== "function") {
-        if ((key !== "objectName") && (key !== "cpuRunTime") && (key !== "enabled")) {
-            propKeys.push(keys[k]);
-        }
-    }
-}   
-return propKeys; 
-}
-job_print_functor = function (printout, maxDepth) {
     if (maxDepth === undefined) maxDepth = 100
     return function (job, depth, index) {
         var tab = "    "
@@ -116,4 +64,9 @@ job_print_functor = function (printout, maxDepth) {
     }
 } 
 
-//jet.task_traverseTree(Render, jet.job_print_functor);
+// Expose functions for regular js including this files through the 'Jet' object
+Jet = {}
+Jet.task_traverse = task_traverse
+Jet.task_traverseTree = task_traverseTree
+Jet.job_propKeys = job_propKeys
+Jet.job_print_functor = job_print_functor

scripts/developer/utilities/lib/jet/jet_qml.js

@@ -1,72 +0,0 @@
-//
-//  Job Engine & Task...
-//  jet.js
-//
-//  Created by Sam Gateau, 2018/03/28
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-"use strict";
-
- // traverse task tree
-function task_traverse(root, functor, depth) {
-    //if (root.isTask()) { 
-        var subs = root.getSubConfigs()
-        depth++;
-        for (var i = 0; i <subs.length; i++) {
-            if (functor(subs[i], depth, i)) {
-                task_traverse(subs[i], functor, depth)
-            }
-        }
-   // }    
-}
-function task_traverseTree(root, functor) {
-    if (functor(root, 0, 0)) {
-        task_traverse(root, functor, 0)
-    }   
-}
-
-// Access job properties
-function job_propKeys(job) {
-var keys = Object.keys(job)
-var propKeys = [];
-for (var k=0; k < keys.length;k++) {
-    // Filter for relevant property
-    var key = keys[k]
-    if ((typeof job[key]) !== "function") {
-        if ((key !== "objectName") && (key !== "cpuRunTime") && (key !== "enabled")) {
-            propKeys.push(keys[k]);
-        }
-    }
-}   
-return propKeys; 
-}
-
-function job_print_functor(printout, maxDepth) {
-    if (maxDepth === undefined) maxDepth = 100
-    return function (job, depth, index) {
-        var tab = "    "
-        var depthTab = "";
-        for (var d = 0; d < depth; d++) { depthTab += tab }
-        printout(depthTab + index + " " + job.objectName + " " + (job.enabled ? "on" : "off")) 
-        var keys = job_propKeys(job);
-        for (var p=0; p < keys.length;p++) {
-            var prop = job[keys[p]]
-            printout(depthTab + tab + tab + typeof prop + " " + keys[p] + " " + prop);
-        }
-
-        return true
-     //   return depth < maxDepth;
-    }
-} 
-
-function getRender() {
-    return Render
-}
-
-
-function getWorkload() {
-    return Workload
-}

scripts/developer/utilities/workload/inspectEngine.js

@@ -1,4 +1,4 @@
-//Script.include('../lib/jet/jet.js');
+Script.include('../lib/jet/jet.js');
 
 
 
@@ -6,20 +6,18 @@
 (function() { // BEGIN LOCAL_SCOPE
     //jet.task_traverseTree(Render, printJob);
     var message = "test";
- /*   var functor = job_print_functor(function (line) { message += line + "\n"; });
+    var functor = Jet.job_print_functor(function (line) { message += line + "\n"; });
         
-    task_traverseTree(Workload, functor
+    Jet.task_traverseTree(Render, functor); 
-    );
-   */ 
     
-    print(message)
+  //  print(message)*/
 
 var qml = Script.resolvePath('../lib/jet/TaskList.qml');
 var window = new OverlayWindow({
     title: 'Inspect Engine',
     source: qml,
-    width: 250, 
+    width: 400, 
-    height: 300
+    height: 500
 });
 
 window.sendToQml(message)

scripts/developer/utilities/workload/workload.js

@@ -12,7 +12,7 @@
 
 (function() {
     var TABLET_BUTTON_NAME = "Workload";
-    var QMLAPP_URL = Script.resolvePath("./workload.qml");
+    var QMLAPP_URL = Script.resolvePath("./workloadInspector.qml");
     var ICON_URL = Script.resolvePath("../../../system/assets/images/luci-i.svg");
     var ACTIVE_ICON_URL = Script.resolvePath("../../../system/assets/images/luci-a.svg");
 

scripts/developer/utilities/workload/workloadInspector.qml

@@ -15,6 +15,9 @@ import "qrc:///qml/styles-uit"
 import "qrc:///qml/controls-uit" as HifiControls
 import  "../render/configSlider"
 
+//import "../lib/jet";
+
+
 Rectangle {
     HifiConstants { id: hifi;}
     id: _workload;   
@@ -33,12 +36,6 @@ Rectangle {
             text: "Workload"       
         }
 
-        CheckBox {
-            text: "Show Views"
-            checked: Workload.getConfig("SpaceToRender")["showViews"]
-            onCheckedChanged: { Workload.getConfig("SpaceToRender")["showViews"] = checked }
-        }
-
         HifiControls.CheckBox {
             boxSize: 20
             text: "Freeze Views"
@@ -46,7 +43,7 @@ Rectangle {
             onCheckedChanged: { Workload.getConfig("SpaceToRender")["freezeViews"] = checked, Workload.getConfig("setupViews")["freezeViews"] = checked; }
         }
 
-        /*RowLayout {
+        RowLayout {
             anchors.left: parent.left
             anchors.right: parent.right 
             Column {
@@ -120,6 +117,6 @@ Rectangle {
             checked: Workload.getConfig("SpaceToRender")["showViews"]
             onCheckedChanged: { Workload.getConfig("SpaceToRender")["showViews"] = checked }
         }
-        Separator {}*/
+        Separator {}
     }
 }