From 4959452c795d0d5f766ddf893782d1e1b5be787b Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Tue, 5 Mar 2019 14:27:32 -0800
Subject: [PATCH] Dynamic creation of the propItem in the propGRoup!

---
 .../developer/utilities/lib/prop/PropEnum.qml |  3 +-
 .../utilities/lib/prop/PropGroup.qml          | 62 ++++++++++++-------
 scripts/developer/utilities/render/luci.qml   | 12 +++-
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/scripts/developer/utilities/lib/prop/PropEnum.qml b/scripts/developer/utilities/lib/prop/PropEnum.qml
index 9446a267b3..ff5dfd8161 100644
--- a/scripts/developer/utilities/lib/prop/PropEnum.qml
+++ b/scripts/developer/utilities/lib/prop/PropEnum.qml
@@ -19,7 +19,7 @@ PropItem {
     property alias enums : valueCombo.model
 
     Component.onCompleted: {
-        valueVar = root.valueVarGetter();
+      //  valueVar = root.valueVarGetter();
     }
 
     PropComboBox {
@@ -32,6 +32,7 @@ PropItem {
         anchors.verticalCenter: root.verticalCenter
         height: global.slimHeight
 
+        currentIndex: root.valueVarGetter()
         onCurrentIndexChanged: { root.valueVarSetter(currentIndex); }
     }    
 }
diff --git a/scripts/developer/utilities/lib/prop/PropGroup.qml b/scripts/developer/utilities/lib/prop/PropGroup.qml
index dd579af7eb..1dfb957536 100644
--- a/scripts/developer/utilities/lib/prop/PropGroup.qml
+++ b/scripts/developer/utilities/lib/prop/PropGroup.qml
@@ -17,7 +17,7 @@ Item {
     // Prop Group is designed to author an array of ProItems, they are defined with an array of the tuplets describing each individual item:
     // [ ..., PropItemInfo, ...]
     // PropItemInfo {
-    //    "type": "PropXXXX", "object": object, "property": "propName"      
+    //    type: "PropXXXX", object: JSobject, property: "propName"      
     // }
     //
     property var propItems: []
@@ -25,18 +25,6 @@ Item {
 
     property var label: "group"
 
-      /*  Component.onCompleted: {
-            var component1 = Qt.createComponent("PropBool.qml");
-                    component1.label = "Test";
-            for (var i=0; i<root.propItems.length; i++) {
-
-            //  if (propItems[i]["type"] == "PropBool") {
-                    var component = Qt.createComponent("PropBool.qml");
-                    component.label = propItems[i]["property"];
-
-            // }
-            }
-        }*/
 
     Column {
         id: column
@@ -49,18 +37,44 @@ Item {
             text: root.label
             horizontalAlignment: Text.AlignHCenter
         }
+      
 
-        Repeater {
-            model: root.propItems
-            PropBool {
-                    label: qsTr(modelData["property"])
-                    object: modelData["object"]
-                    property: modelData["property"]
-                    anchors.left: parent.left
-                    anchors.right: parent.right 
-            }
-        }   
     }
-
     height: column.height
+
+    Component.onCompleted: {
+        for (var i = 0; i < root.propItems.length; i++) {
+            var proItem = root.propItems[i];
+            switch(proItem.type) {
+                case 'PropBool': {
+                    var component = Qt.createComponent("PropBool.qml");
+                    component.createObject(column, {
+                        "label": proItem.property,
+                        "object": proItem.object,
+                        "property": proItem.property
+                    })
+                } break;
+                case 'PropScalar': {
+                    var component = Qt.createComponent("PropScalar.qml");
+                    component.createObject(column, {
+                        "label": proItem.property,
+                        "object": proItem.object,
+                        "property": proItem.property,
+                        "min": (proItem["min"] !== undefined ? proItem.min : 0.0),                   
+                        "max": (proItem["max"] !== undefined ? proItem.max : 1.0),                                       
+                        "integer": (proItem["integral"] !== undefined ? proItem.integral : false),
+                    })
+                } break;
+                case 'PropEnum': {
+                    var component = Qt.createComponent("PropEnum.qml");
+                    component.createObject(column, {
+                        "label": proItem.property,
+                        "object": proItem.object,
+                        "property": proItem.property,
+                        "enums": (proItem["enums"] !== undefined ? proItem.enums : ["Undefined Enums !!!"]), 
+                    })
+                } break;
+            }      
+        }
+    }
 }
diff --git a/scripts/developer/utilities/render/luci.qml b/scripts/developer/utilities/render/luci.qml
index 460d20e224..d009d52f55 100644
--- a/scripts/developer/utilities/render/luci.qml
+++ b/scripts/developer/utilities/render/luci.qml
@@ -26,7 +26,7 @@ Rectangle {
     Column {
         anchors.left: parent.left
         anchors.right: parent.right       
-        Repeater {
+      /*  Repeater {
             model: [ "Tone mapping exposure:ToneMapping:exposure:5.0:-5.0",
                      "Tone:ToneMapping:exposure:5.0:-5.0"
                         ]
@@ -61,13 +61,19 @@ Rectangle {
             property: "enableBackground"
             anchors.left: parent.left
             anchors.right: parent.right 
-        }
+        }*/
         Prop.PropGroup {
             label: "My group"
             propItems: [
                 {"type": "PropBool", "object": render.mainViewTask.getConfig("LightingModel"), "property": "enableBackground"},
-                {"type": "PropBool", "object": render.mainViewTask.getConfig("LightingModel"), "property": "enableDiffuse"},
+                {"type": "PropScalar", "object": render.mainViewTask.getConfig("ToneMapping"), "property": "exposure"},
                 {"type": "PropBool", "object": render.mainViewTask.getConfig("LightingModel"), "property": "enableEmissive"},
+                {"type": "PropEnum", "object": render.mainViewTask.getConfig("ToneMapping"), "property": "curve", enums: [
+                        "RGB",
+                        "SRGB",
+                        "Reinhard",
+                        "Filmic",
+                    ]},
             ]
             anchors.left: parent.left
             anchors.right: parent.right