From c540016af6b4f8428a04b23d6b31c95d14db4a66 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Tue, 5 Mar 2019 20:22:19 -0800 Subject: [PATCH] This is working !!!! --- .../utilities/lib/jet/qml/TaskPropView.qml | 40 +++++++++++++++++++ .../developer/utilities/lib/jet/qml/qmldir | 1 + .../utilities/lib/prop/PropGroup.qml | 7 +++- scripts/developer/utilities/render/luci.qml | 11 ++++- 4 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 scripts/developer/utilities/lib/jet/qml/TaskPropView.qml diff --git a/scripts/developer/utilities/lib/jet/qml/TaskPropView.qml b/scripts/developer/utilities/lib/jet/qml/TaskPropView.qml new file mode 100644 index 0000000000..350103021a --- /dev/null +++ b/scripts/developer/utilities/lib/jet/qml/TaskPropView.qml @@ -0,0 +1,40 @@ +// +// jet/TaskListView.qml +// +// Created by Sam Gateau, 2018/05/09 +// 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 +// + +import QtQuick 2.7 +import QtQuick.Controls 1.4 as Original +import QtQuick.Controls.Styles 1.4 + +import stylesUit 1.0 +import controlsUit 1.0 as HifiControls + +import "../../prop" as Prop + +import "../jet.js" as Jet + +Prop.PropGroup { + + id: root; + + property var rootConfig : Render + property var jobPath: "" + property alias jobName: root.label + + Component.onCompleted: { + var props = Jet.job_propKeys(rootConfig.getConfig(jobPath)); + //console.log(JSON.stringify(props)); + for (var p in props) { + root.propItems.push({"type": "PropBool", "object": rootConfig.getConfig(jobPath), "property":props[p] }) + } + root.updatePropItems(); + } + + +} \ No newline at end of file diff --git a/scripts/developer/utilities/lib/jet/qml/qmldir b/scripts/developer/utilities/lib/jet/qml/qmldir index e16820914b..2914c27c23 100644 --- a/scripts/developer/utilities/lib/jet/qml/qmldir +++ b/scripts/developer/utilities/lib/jet/qml/qmldir @@ -1,3 +1,4 @@ TaskList 1.0 TaskList.qml TaskViewList 1.0 TaskViewList.qml TaskTimeFrameView 1.0 TaskTimeFrameView.qml +TaskPropView 1.0 TaskPropView.qml \ No newline at end of file diff --git a/scripts/developer/utilities/lib/prop/PropGroup.qml b/scripts/developer/utilities/lib/prop/PropGroup.qml index 1dfb957536..6f5607def4 100644 --- a/scripts/developer/utilities/lib/prop/PropGroup.qml +++ b/scripts/developer/utilities/lib/prop/PropGroup.qml @@ -42,8 +42,8 @@ Item { } height: column.height - Component.onCompleted: { - for (var i = 0; i < root.propItems.length; i++) { + function updatePropItems() { + for (var i = 0; i < root.propItems.length; i++) { var proItem = root.propItems[i]; switch(proItem.type) { case 'PropBool': { @@ -77,4 +77,7 @@ Item { } } } + Component.onCompleted: { + updatePropItems(); + } } diff --git a/scripts/developer/utilities/render/luci.qml b/scripts/developer/utilities/render/luci.qml index d009d52f55..d5156c3cf7 100644 --- a/scripts/developer/utilities/render/luci.qml +++ b/scripts/developer/utilities/render/luci.qml @@ -14,6 +14,7 @@ import QtQuick.Layouts 1.3 import controlsUit 1.0 as HifiControls import "../lib/prop" as Prop +import "../lib/jet/qml" as Jet Rectangle { Prop.Global { id: prop;} @@ -62,7 +63,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right }*/ - Prop.PropGroup { + /* Prop.PropGroup { label: "My group" propItems: [ {"type": "PropBool", "object": render.mainViewTask.getConfig("LightingModel"), "property": "enableBackground"}, @@ -75,6 +76,14 @@ Rectangle { "Filmic", ]}, ] + anchors.left: parent.left + anchors.right: parent.right + }*/ + + Jet.TaskPropView { + jobPath: "RenderMainView.LightingModel" + label: "Le tone mapping Job" + anchors.left: parent.left anchors.right: parent.right }