From ff5b418ddf990a3d0d460bcb9f284eed225815cd Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 3 Apr 2018 17:21:37 -0700 Subject: [PATCH] Starting to buiuild on the jet component and adding the widget to luci and workload inspectors --- scripts/developer/utilities/lib/jet/jet.js | 5 +++-- .../utilities/lib/jet/{ => qml}/TaskList.qml | 21 +++++-------------- .../developer/utilities/lib/jet/qml/qmldir | 1 + .../utilities/render/deferredLighting.qml | 10 +++++++++ .../utilities/workload/inspectEngine.js | 19 ++--------------- .../utilities/workload/workloadInspector.qml | 16 +++++++++++--- 6 files changed, 34 insertions(+), 38 deletions(-) rename scripts/developer/utilities/lib/jet/{ => qml}/TaskList.qml (68%) create mode 100644 scripts/developer/utilities/lib/jet/qml/qmldir diff --git a/scripts/developer/utilities/lib/jet/jet.js b/scripts/developer/utilities/lib/jet/jet.js index dc50e5c653..39da9b6d90 100644 --- a/scripts/developer/utilities/lib/jet/jet.js +++ b/scripts/developer/utilities/lib/jet/jet.js @@ -65,8 +65,9 @@ function job_print_functor(printout, maxDepth) { } // Expose functions for regular js including this files through the 'Jet' object -Jet = {} +/*Jet = {} Jet.task_traverse = task_traverse Jet.task_traverseTree = task_traverseTree Jet.job_propKeys = job_propKeys -Jet.job_print_functor = job_print_functor \ No newline at end of file +Jet.job_print_functor = job_print_functor +*/ \ No newline at end of file diff --git a/scripts/developer/utilities/lib/jet/TaskList.qml b/scripts/developer/utilities/lib/jet/qml/TaskList.qml similarity index 68% rename from scripts/developer/utilities/lib/jet/TaskList.qml rename to scripts/developer/utilities/lib/jet/qml/TaskList.qml index baa579b4a3..fa004627a7 100644 --- a/scripts/developer/utilities/lib/jet/TaskList.qml +++ b/scripts/developer/utilities/lib/jet/qml/TaskList.qml @@ -15,24 +15,13 @@ 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 Hifi 1.0 as Hifi - -//import "qrc:///qml/styles-uit" -//import "qrc:///qml/controls-uit" as HifiControls - -import "jet.js" as Jet +import "../jet.js" as Jet Rectangle { id: root - width: parent ? parent.width : 200 - height: parent ? parent.height : 400 - property var rootConfig + // width: parent ? parent.width : 200 + // height: parent ? parent.height : 400 + property var rootConfig : Workload Original.TextArea { id: textArea @@ -44,7 +33,7 @@ Rectangle { Component.onCompleted: { var message = "" var functor = Jet.job_print_functor(function (line) { message += line + "\n"; }); - Jet.task_traverseTree(Workload, functor); + Jet.task_traverseTree(rootConfig, functor); textArea.append(message); } function fromScript(mope) { diff --git a/scripts/developer/utilities/lib/jet/qml/qmldir b/scripts/developer/utilities/lib/jet/qml/qmldir new file mode 100644 index 0000000000..f926d8cc67 --- /dev/null +++ b/scripts/developer/utilities/lib/jet/qml/qmldir @@ -0,0 +1 @@ +TaskList 1.0 TaskList.qml \ No newline at end of file diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml index 189d23c44f..160ec26be0 100644 --- a/scripts/developer/utilities/render/deferredLighting.qml +++ b/scripts/developer/utilities/render/deferredLighting.qml @@ -14,6 +14,7 @@ import QtQuick.Layouts 1.3 import "qrc:///qml/styles-uit" import "qrc:///qml/controls-uit" as HifiControls import "configSlider" +import "../lib/jet/qml" as Jet Rectangle { HifiConstants { id: hifi;} @@ -274,6 +275,15 @@ Rectangle { } } } + Separator {} + + Jet.TaskList { + rootConfig: Render + anchors.left: parent.left + anchors.right: parent.right + + height: 200 + } } //} } diff --git a/scripts/developer/utilities/workload/inspectEngine.js b/scripts/developer/utilities/workload/inspectEngine.js index 37280037da..6d79ba41a1 100644 --- a/scripts/developer/utilities/workload/inspectEngine.js +++ b/scripts/developer/utilities/workload/inspectEngine.js @@ -1,27 +1,12 @@ -Script.include('../lib/jet/jet.js'); - - - - (function() { // BEGIN LOCAL_SCOPE - //jet.task_traverseTree(Render, printJob); - var message = "test"; - var functor = Jet.job_print_functor(function (line) { message += line + "\n"; }); - - Jet.task_traverseTree(Render, functor); - - // print(message)*/ - -var qml = Script.resolvePath('../lib/jet/TaskList.qml'); +var qml = Script.resolvePath('./workloadInspector.qml'); var window = new OverlayWindow({ title: 'Inspect Engine', source: qml, width: 400, - height: 500 + height: 600 }); -window.sendToQml(message) - window.closed.connect(function () { Script.stop(); }); Script.scriptEnding.connect(function () { /* var geometry = JSON.stringify({ diff --git a/scripts/developer/utilities/workload/workloadInspector.qml b/scripts/developer/utilities/workload/workloadInspector.qml index 27b85b9a92..ca8f11355a 100644 --- a/scripts/developer/utilities/workload/workloadInspector.qml +++ b/scripts/developer/utilities/workload/workloadInspector.qml @@ -13,14 +13,16 @@ import QtQuick.Layouts 1.3 import "qrc:///qml/styles-uit" import "qrc:///qml/controls-uit" as HifiControls -import "../render/configSlider" - -//import "../lib/jet"; +import "../render/configSlider" +import "../lib/jet/qml" as Jet Rectangle { HifiConstants { id: hifi;} id: _workload; + + width: parent ? parent.width : 400 + height: parent ? parent.height : 600 anchors.margins: hifi.dimensions.contentMargin.x color: hifi.colors.baseGray; @@ -118,5 +120,13 @@ Rectangle { onCheckedChanged: { Workload.getConfig("SpaceToRender")["showViews"] = checked } } Separator {} + + Jet.TaskList { + rootConfig: Workload + anchors.left: parent.left + anchors.right: parent.right + + height: 300 + } } }