ui: a few fixes for attribute override usage

mcallegari · Aug 13, 2017 · b10c2cb · b10c2cb
1 parent fc2fd22
commit b10c2cb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/engine/src/function.cpp b/engine/src/function.cpp
@@ -1234,7 +1234,7 @@ int Function::requestAttributeOverride(int attributeIndex, qreal value)
 
     calculateOverrideValue(attributeIndex);
 
-    qDebug() << name() << "Override requested for attribute" << attributeIndex << "returned" << m_lastOverrideAttributeId;
+    qDebug() << name() << "Override requested for attribute" << attributeIndex << "value" << value << "ID" << m_lastOverrideAttributeId;
 
     m_lastOverrideAttributeId++;
 

diff --git a/ui/src/virtualconsole/vcbutton.cpp b/ui/src/virtualconsole/vcbutton.cpp
@@ -422,7 +422,7 @@ void VCButton::notifyFunctionStarting(quint32 fid, qreal intensity)
         if (f != NULL)
         {
             f->stop(functionParent());
-            m_intensityOverrideId = -1;
+            resetIntensityOverrideAttribute();
         }
     }
 }
@@ -433,7 +433,7 @@ void VCButton::slotFunctionRemoved(quint32 fid)
     if (fid == m_function)
     {
         setFunction(Function::invalidId());
-        m_intensityOverrideId = -1;
+        resetIntensityOverrideAttribute();
     }
 }
 
@@ -679,7 +679,7 @@ void VCButton::pressFunction()
         if (state() == Active && !(isChildOfSoloFrame() && f->startedAsChild()))
         {
             f->stop(functionParent());
-            m_intensityOverrideId = -1;
+            resetIntensityOverrideAttribute();
         }
         else
         {
@@ -747,7 +747,7 @@ void VCButton::slotFunctionStopped(quint32 fid)
 {
     if (fid == m_function && m_action == Toggle)
     {
-        m_intensityOverrideId = -1;
+        resetIntensityOverrideAttribute();
         setState(Inactive);
         blink(250);
     }
@@ -822,7 +822,7 @@ QMenu* VCButton::customMenu(QMenu* parentMenu)
 
 void VCButton::adjustIntensity(qreal val)
 {
-    if (state() != Monitoring)
+    if (state() == Active)
     {
         Function* func = m_doc->function(m_function);
         if (func != NULL)

diff --git a/ui/src/virtualconsole/vccuelist.cpp b/ui/src/virtualconsole/vccuelist.cpp
@@ -592,7 +592,7 @@ void VCCueList::slotFunctionRemoved(quint32 fid)
     if (fid == m_chaserID)
     {
         setChaser(Function::invalidId());
-        m_intensityOverrideId = -1;
+        resetIntensityOverrideAttribute();
     }
 }
 
@@ -954,7 +954,7 @@ void VCCueList::stopChaser()
     if (ch == NULL)
         return;
     ch->stop(functionParent());
-    m_intensityOverrideId = -1;
+    resetIntensityOverrideAttribute();
 }
 
 void VCCueList::setNextPrevBehavior(NextPrevBehavior nextPrev)

diff --git a/ui/src/virtualconsole/vcslider.cpp b/ui/src/virtualconsole/vcslider.cpp
@@ -1113,7 +1113,6 @@ void VCSlider::writeDMXPlayback(MasterTimer* timer, QList<Universe *> ua)
     if (value == 0)
     {
         // Make sure we ignore the fade out time
-        adjustFunctionIntensity(function, 0);
         if (function->stopped() == false)
         {
             function->stop(functionParent());
@@ -1130,9 +1129,9 @@ void VCSlider::writeDMXPlayback(MasterTimer* timer, QList<Universe *> ua)
             function->start(timer, functionParent(),
                             0, 0, Function::defaultSpeed(), Function::defaultSpeed());
 #endif
-            adjustFunctionIntensity(function, pIntensity * intensity());
             function->start(timer, functionParent());
         }
+        adjustFunctionIntensity(function, pIntensity * intensity());
         emit functionStarting(m_playbackFunction, pIntensity);
     }
     m_playbackChangeCounter--;

diff --git a/ui/src/virtualconsole/vcwidget.cpp b/ui/src/virtualconsole/vcwidget.cpp
@@ -508,6 +508,8 @@ void VCWidget::adjustFunctionIntensity(Function *f, qreal value)
     if (f == NULL)
         return;
 
+    //qDebug() << "adjustFunctionIntensity" << caption() << "value" << value;
+
     if (m_intensityOverrideId == Function::invalidAttributeId())
         m_intensityOverrideId = f->requestAttributeOverride(Function::Intensity, value);
     else