From aa749b0980e5649e974c499ea55de51a3b24ef6d Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 28 Nov 2018 21:46:13 -0800 Subject: [PATCH] adressing review comments --- .../utilities/lib/jet/qml/TaskListView.qml | 24 +------------------ .../lib/jet/qml/TaskTimeFrameView.qml | 1 - .../utilities/render/engineInspector.js | 14 ----------- .../utilities/render/engineInspector.qml | 2 +- 4 files changed, 2 insertions(+), 39 deletions(-) diff --git a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml index bc14404ee2..e2576fe783 100644 --- a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml +++ b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml @@ -26,30 +26,10 @@ Rectangle { Component.onCompleted: { - //var functor = Jet.job_tree_model_functor(jobsModel) var functor = Jet.job_tree_model_functor(jobsModel, 3, function(node) { node["cpuT"] = 0.0 }) Jet.task_traverseTree(rootConfig, functor); - - - - /* var tfunctor = Jet.job_tree_model_array_functor(jobsModel.engineJobItemModel, function(node) { - node["init"] = (node.level < 3) - node["fullpath"] = (node.path + "." + node.name) - node["cpuT"] = 0.0 - }) - - Jet.task_traverseTree(rootConfig, tfunctor); -*/ - // var currentParentStach = [] - // currentParentStach.push(jobsModel); - - - /* Jet.job_traverseTreeNodeRoot(jobsModel.engineJobItemModel[0], function(node, depth, index) { - print(node.name + depth + " - " + index) - return true - })*/ } @@ -95,15 +75,13 @@ Rectangle { HifiControls.Label { id: objLabel - // property var config: root.rootConfig.getConfig(model.path + "." + model.name); colorScheme: (root.rootConfig.getConfig(model.path + "." + model.name) ? hifi.colorSchemes.dark : hifi.colorSchemes.light) text: (objRecursiveColumn.children.length > 2 ? objRecursiveColumn.children[1].visible ? qsTr("- ") : qsTr("+ ") : qsTr(" ")) + model.name - // + " ms=" + config.cpuRunTime.toFixed(3) + " id=" + model.id } - } + } } Repeater { diff --git a/scripts/developer/utilities/lib/jet/qml/TaskTimeFrameView.qml b/scripts/developer/utilities/lib/jet/qml/TaskTimeFrameView.qml index e1d9bd7ce1..f3ca550e44 100644 --- a/scripts/developer/utilities/lib/jet/qml/TaskTimeFrameView.qml +++ b/scripts/developer/utilities/lib/jet/qml/TaskTimeFrameView.qml @@ -166,7 +166,6 @@ Rectangle { function drawJob(ctx, depth, index, duration, timeOffset) { //print(root.jobsArray[index].cpuT) - // ctx.fillStyle = Qt.rgba(255, 255, 0, root.backgroundOpacity); ctx.fillStyle = ( depth % 2 ? ( index % 2 ? "blue" : "yellow") : ( index % 2 ? "green" : "red")) ctx.fillRect(getXFromTime(timeOffset), lineHeight * 2 * depth,getWFromDuration(duration), lineHeight); diff --git a/scripts/developer/utilities/render/engineInspector.js b/scripts/developer/utilities/render/engineInspector.js index 74e4231ff1..cd2b74f907 100644 --- a/scripts/developer/utilities/render/engineInspector.js +++ b/scripts/developer/utilities/render/engineInspector.js @@ -1,17 +1,3 @@ - /*function openEngineTaskView() { - // Set up the qml ui - var qml = Script.resolvePath('engineInspector.qml'); - var window = new OverlayWindow({ - title: 'Render Engine', - source: qml, - width: 500, - height: 100 - }); - window.setPosition(200, 50); - window.closed.connect(function() { Script.stop(); }); - } - openEngineTaskView();*/ - (function() { var TABLET_BUTTON_NAME = "Inspector"; var QMLAPP_URL = Script.resolvePath("./engineInspector.qml"); diff --git a/scripts/developer/utilities/render/engineInspector.qml b/scripts/developer/utilities/render/engineInspector.qml index 31283a4756..1e05605ac7 100644 --- a/scripts/developer/utilities/render/engineInspector.qml +++ b/scripts/developer/utilities/render/engineInspector.qml @@ -26,5 +26,5 @@ Item { Jet.TaskListView { rootConfig: root.rootConfig anchors.fill: root - } + } } \ No newline at end of file