qmlui: restored VC Slider value catching from external controller

Reported: https://www.qlcplus.org/forum/viewtopic.php?t=19130

Author: mcallegari

qmlui/qml/virtualconsole/VCSliderProperties.qml

@@ -414,6 +414,35 @@ Rectangle
               }
         } // SectionBox Values range
 
+        SectionBox
+        {
+            sectionLabel: qsTr("External input")
+
+            sectionContents:
+              GridLayout
+              {
+                width: parent.width
+                columns: 2
+                columnSpacing: 5
+                rowSpacing: 4
+
+                CustomCheckBox
+                {
+                    implicitWidth: UISettings.iconSizeMedium
+                    implicitHeight: implicitWidth
+                    checked: widgetRef ? widgetRef.catchValues : false
+                    onClicked: if (widgetRef) widgetRef.catchValues = checked
+                }
+
+                RobotoText
+                {
+                    height: gridItemsHeight
+                    Layout.fillWidth: true
+                    label: qsTr("Catch up with the external controller input value")
+                }
+              }
+        } // end of SectionBox External input
+
         SectionBox
         {
             visible: widgetRef ? widgetRef.sliderMode === VCSlider.GrandMaster : false

qmlui/virtualconsole/vcslider.cpp

@@ -47,6 +47,7 @@
 
 #define KXMLQLCVCSliderClickAndGoType       QStringLiteral("ClickAndGoType")
 #define KXMLQLCVCSliderInvertedAppearance   QStringLiteral("InvertedAppearance")
+#define KXMLQLCVCSliderCatchValues          QStringLiteral("CatchValues")
 
 #define KXMLQLCVCSliderLevel            QStringLiteral("Level")
 #define KXMLQLCVCSliderLevelLowLimit    QStringLiteral("LowLimit")
@@ -70,16 +71,21 @@
 #define INPUT_SLIDER_RESET_ID       1
 #define INPUT_SLIDER_FLASH_ID       2
 
+/** +/- value range to catch the slider for external
+ *  controllers with no feedback support */
+#define VALUE_CATCHING_THRESHOLD    4
 
 VCSlider::VCSlider(Doc *doc, QObject *parent)
     : VCWidget(doc, parent)
     , m_widgetMode(WSlider)
     , m_valueDisplayStyle(DMXValue)
     , m_invertedAppearance(false)
+    , m_catchValues(false)
     , m_sliderMode(Adjust)
     , m_value(0)
     , m_rangeLowLimit(0)
     , m_rangeHighLimit(UCHAR_MAX)
+    , m_lastInputValue(-1)
     , m_levelValueChanged(false)
     , m_monitorEnabled(false)
     , m_monitorValue(0)
@@ -195,6 +201,7 @@ bool VCSlider::copyFrom(const VCWidget *widget)
     /* Copy slider appearance */
     setValueDisplayStyle(slider->valueDisplayStyle());
     setInvertedAppearance(slider->invertedAppearance());
+    setCatchValues(slider->catchValues());
 
     /* Copy Click & Go feature */
     setClickAndGoType(slider->clickAndGoType());
@@ -377,6 +384,24 @@ void VCSlider::setInvertedAppearance(bool inverted)
     emit invertedAppearanceChanged(inverted);
 }
 
+/*********************************************************************
+ * Value catching feature
+ *********************************************************************/
+
+bool VCSlider::catchValues() const
+{
+    return m_catchValues;
+}
+
+void VCSlider::setCatchValues(bool enable)
+{
+    if (enable == m_catchValues)
+        return;
+
+    m_catchValues = enable;
+    emit catchValuesChanged(enable);
+}
+
 /*********************************************************************
  * Slider value
  *********************************************************************/
@@ -1378,7 +1403,23 @@ void VCSlider::slotInputValueChanged(quint8 id, uchar value)
     switch (id)
     {
         case INPUT_SLIDER_CONTROL_ID:
+            if (catchValues())
+            {
+                int currentValue = m_value;
+
+                // filter 'out of threshold' cases
+                if (m_lastInputValue == -1 ||
+                    (m_lastInputValue < currentValue - VALUE_CATCHING_THRESHOLD &&
+                     scaledValue < currentValue - VALUE_CATCHING_THRESHOLD) ||
+                    (m_lastInputValue > currentValue + VALUE_CATCHING_THRESHOLD &&
+                     scaledValue > currentValue + VALUE_CATCHING_THRESHOLD))
+                {
+                    m_lastInputValue = scaledValue;
+                    break;
+                }
+            }
             setValue(scaledValue, true, false);
+            m_lastInputValue = scaledValue;
         break;
         case INPUT_SLIDER_RESET_ID:
             if (value)
@@ -1419,6 +1460,10 @@ bool VCSlider::loadXML(QXmlStreamReader &root)
     else
         setInvertedAppearance(true);
 
+    /* Values catching */
+    if (attrs.hasAttribute(KXMLQLCVCSliderCatchValues))
+        setCatchValues(true);
+
     while (root.readNextStartElement())
     {
         if (root.name() == KXMLQLCWindowState)
@@ -1634,6 +1679,10 @@ bool VCSlider::saveXML(QXmlStreamWriter *doc) const
     else
         doc->writeAttribute(KXMLQLCVCSliderInvertedAppearance, "false");
 
+    /* Values catching */
+    if (catchValues() == true)
+        doc->writeAttribute(KXMLQLCVCSliderCatchValues, "true");
+
     /* Window state */
     saveXMLWindowState(doc);
 

qmlui/virtualconsole/vcslider.h

@@ -38,6 +38,7 @@ class VCSlider : public VCWidget, public DMXSource
     Q_PROPERTY(ValueDisplayStyle valueDisplayStyle READ valueDisplayStyle WRITE setValueDisplayStyle NOTIFY valueDisplayStyleChanged)
     Q_PROPERTY(bool invertedAppearance READ invertedAppearance WRITE setInvertedAppearance NOTIFY invertedAppearanceChanged)
     Q_PROPERTY(SliderMode sliderMode READ sliderMode WRITE setSliderMode NOTIFY sliderModeChanged)
+    Q_PROPERTY(bool catchValues READ catchValues WRITE setCatchValues NOTIFY catchValuesChanged)
 
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(qreal rangeLowLimit READ rangeLowLimit WRITE setRangeLowLimit NOTIFY rangeLowLimitChanged)
@@ -146,10 +147,12 @@ class VCSlider : public VCWidget, public DMXSource
 signals:
     void valueDisplayStyleChanged(ValueDisplayStyle valueDisplayStyle);
     void invertedAppearanceChanged(bool inverted);
+    void catchValuesChanged(bool enable);
 
 protected:
     ValueDisplayStyle m_valueDisplayStyle;
     bool m_invertedAppearance;
+    bool m_catchValues;
 
     /*********************************************************************
      * Slider Mode
@@ -180,6 +183,10 @@ class VCSlider : public VCWidget, public DMXSource
     int value() const;
     void setValue(int value, bool setDMX = true, bool updateFeedback = true);
 
+    /** Get/Set the external input values catching */
+    bool catchValues() const;
+    void setCatchValues(bool enable);
+
     /** Set/Get the lower limit for the slider values */
     void setRangeLowLimit(qreal value);
     qreal rangeLowLimit() const;
@@ -202,6 +209,7 @@ class VCSlider : public VCWidget, public DMXSource
     int m_value;
     qreal m_rangeLowLimit;
     qreal m_rangeHighLimit;
+    int m_lastInputValue;
 
     /*********************************************************************
      * Level mode