qmlui: increase position tool precision to 0.01 degrees

mcallegari · Nov 11, 2024 · edb4d31 · edb4d31
1 parent e8ecb67
commit edb4d31
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/engine/src/fixture.cpp b/engine/src/fixture.cpp
@@ -310,7 +310,7 @@ QVector <quint32> Fixture::cmyChannels(int head) const
     return m_fixtureMode->heads().at(head).cmyChannels();
 }
 
-QList<SceneValue> Fixture::positionToValues(int type, int degrees, bool isRelative)
+QList<SceneValue> Fixture::positionToValues(int type, float degrees, bool isRelative)
 {
     QList<SceneValue> posList;
     // cache a list of channels processed, to avoid duplicates

diff --git a/engine/src/fixture.h b/engine/src/fixture.h
@@ -277,7 +277,7 @@ class Fixture : public QObject
 
     /** Return a list of DMX values based on the given position degrees
      *  and the provided type (Pan or Tilt) */
-    QList<SceneValue> positionToValues(int type, int degrees, bool isRelative = false);
+    QList<SceneValue> positionToValues(int type, float degrees, bool isRelative = false);
 
     /** Return a list of DMX values based on the given zoom degrees */
     QList<SceneValue> zoomToValues(float degrees, bool isRelative);

diff --git a/qmlui/contextmanager.cpp b/qmlui/contextmanager.cpp
@@ -1478,7 +1478,7 @@ void ContextManager::setChannelValueByType(int type, int value, bool isRelative,
     }
 }
 
-void ContextManager::setPositionValue(int type, int degrees, bool isRelative)
+void ContextManager::setPositionValue(int type, float degrees, bool isRelative)
 {
     // list to keep track of the already processed Fixture IDs
     QList<quint32>fxIDs;

diff --git a/qmlui/contextmanager.h b/qmlui/contextmanager.h
@@ -238,7 +238,7 @@ public slots:
     Q_INVOKABLE void setColorValue(QColor col, QColor wauv);
 
     /** Set a Pan/Tilt position in degrees */
-    Q_INVOKABLE void setPositionValue(int type, int degrees, bool isRelative);
+    Q_INVOKABLE void setPositionValue(int type, float degrees, bool isRelative);
 
     /** Set Pan/Tilt values at half position */
     Q_INVOKABLE void setPositionCenter();

diff --git a/qmlui/qml/CustomDoubleSpinBox.qml b/qmlui/qml/CustomDoubleSpinBox.qml
@@ -50,4 +50,10 @@ CustomSpinBox
     }
 
     onValueModified: realValue = value / Math.pow(10, decimals)
+
+    function setValue(newValue)
+    {
+        value = newValue
+        realValue = newValue / Math.pow(10, decimals)
+    }
 }
diff --git a/qmlui/qml/fixturesfunctions/PositionTool.qml b/qmlui/qml/fixturesfunctions/PositionTool.qml
@@ -36,11 +36,11 @@ Rectangle
     property int panMaxDegrees: 360
     property int tiltMaxDegrees: 270
 
-    property alias panDegrees: panSpinBox.value
+    property alias panDegrees: panSpinBox.realValue
     property int previousPanDegrees: 0
     property bool relativePanValue: false
 
-    property alias tiltDegrees: tiltSpinBox.value
+    property alias tiltDegrees: tiltSpinBox.realValue
     property int previousTiltDegrees: 0
     property bool relativeTiltValue: false
 
@@ -63,7 +63,7 @@ Rectangle
         else
         {
             relativePanValue = false
-            panDegrees = Math.round(pan)
+            panDegrees = pan * Math.pow(10, panSpinBox.decimals)
         }
 
         var tilt = contextManager.getCurrentValue(QLCChannel.Tilt, true)
@@ -75,7 +75,7 @@ Rectangle
         else
         {
             relativeTiltValue = false
-            tiltDegrees = Math.round(tilt)
+            tiltDegrees = tilt * Math.pow(10, tiltSpinBox.decimals)
         }
     }
 
@@ -361,12 +361,13 @@ Rectangle
             label: "Pan"
         }
 
-        CustomSpinBox
+        CustomDoubleSpinBox
         {
             id: panSpinBox
             Layout.fillWidth: true
-            from: relativePanValue ? -panMaxDegrees : 0
-            to: panMaxDegrees
+            realFrom: relativePanValue ? -panMaxDegrees : 0
+            realTo: panMaxDegrees
+            realStep: 0.1
             value: 0
             suffix: "°"
 
@@ -381,9 +382,10 @@ Rectangle
             tooltip: qsTr("Snap to the previous value")
             onClicked:
             {
-                var prev = (parseInt(panSpinBox.value / 45) * 45) - 45
+                var prev = (parseInt(panSpinBox.realValue / 45) * 45) - 45
+                console.log("---- PREV PAN " + prev)
                 if (prev >= 0)
-                    panSpinBox.value = prev
+                    panSpinBox.setValue(prev * 100)
             }
         }
         IconButton
@@ -394,9 +396,10 @@ Rectangle
             tooltip: qsTr("Snap to the next value")
             onClicked:
             {
-                var next = (parseInt(panSpinBox.value / 45) * 45) + 45
+                var next = (parseInt(panSpinBox.realValue / 45) * 45) + 45
+                console.log("---- NEXT PAN " + next)
                 if (next <= panMaxDegrees)
-                    panSpinBox.value = next
+                    panSpinBox.setValue(next * 100)
             }
         }
 
@@ -407,12 +410,13 @@ Rectangle
             label: "Tilt"
         }
 
-        CustomSpinBox
+        CustomDoubleSpinBox
         {
             id: tiltSpinBox
             Layout.fillWidth: true
-            from: relativeTiltValue ? -tiltMaxDegrees : 0
-            to: tiltMaxDegrees
+            realFrom: relativeTiltValue ? -tiltMaxDegrees : 0
+            realTo: tiltMaxDegrees
+            realStep: 0.1
             value: 0
             suffix: "°"
 
@@ -430,9 +434,9 @@ Rectangle
                 var fixedPos = tiltPositionsArray()
                 for (var i = fixedPos.length - 1; i >= 0; i--)
                 {
-                    if (parseInt(fixedPos[i]) < tiltSpinBox.value)
+                    if (parseInt(fixedPos[i]) < tiltDegrees)
                     {
-                        tiltSpinBox.value = parseInt(fixedPos[i])
+                        tiltSpinBox.setValue(parseInt(fixedPos[i]) * 100)
                         break;
                     }
                 }
@@ -449,9 +453,9 @@ Rectangle
                 var fixedPos = tiltPositionsArray()
                 for (var i = 0; i < fixedPos.length; i++)
                 {
-                    if (tiltSpinBox.value < parseInt(fixedPos[i]))
+                    if (tiltDegrees < parseInt(fixedPos[i]))
                     {
-                        tiltSpinBox.value = parseInt(fixedPos[i])
+                        tiltSpinBox.setValue(parseInt(fixedPos[i]) * 100)
                         break;
                     }
                 }