Permalink
Browse files

qmlui: fix Chaser editor common hold and duration mode updates

  • Loading branch information...
mcallegari committed Nov 20, 2018
1 parent a6f6687 commit ddb18d9c2bbab7666ef4fbc3a27cebaceb5b2cfc
Showing with 14 additions and 2 deletions.
  1. +12 −2 qmlui/chasereditor.cpp
  2. +1 −0 qmlui/qml/ChaserWidget.qml
  3. +1 −0 qmlui/qml/fixturesfunctions/ChaserEditor.qml
@@ -523,7 +523,7 @@ void ChaserEditor::setStepSpeed(int index, int value, int type)
if (m_chaser == NULL || index < 0 || index >= m_chaser->stepsCount())
return;
switch(Function::PropType(type))
switch (Function::PropType(type))
{
case Function::FadeIn:
{
@@ -540,7 +540,17 @@ void ChaserEditor::setStepSpeed(int index, int value, int type)
}
break;
case Function::Hold:
setSelectedValue(Function::Hold, "hold", uint(value));
if (m_chaser->durationMode() == Chaser::Common)
{
Tardis::instance()->enqueueAction(Tardis::FunctionSetDuration, m_chaser->id(), m_chaser->duration(), value);
m_chaser->setDuration(value);
setSelectedValue(Function::Duration, "hold", uint(value), false);
setSelectedValue(Function::Duration, "duration", uint(value), false);
}
else
{
setSelectedValue(Function::Hold, "hold", uint(value));
}
break;
case Function::FadeOut:
if (m_chaser->fadeOutMode() == Chaser::Common)
@@ -31,6 +31,7 @@ Column
property bool isSequence: false
property alias model: cStepsList.model
property alias playbackIndex: cStepsList.currentIndex
property alias speedType: timeEditTool.speedType
property int tempoType: QLCFunction.Time
property bool isRunning: false
property alias containsDrag: cwDropArea.containsDrag
@@ -149,6 +149,7 @@ Rectangle
height: ceContainer.height - (topbar.visible ? topbar.height : 0) - chModes.height
model: chaserEditor.stepsList
playbackIndex: chaserEditor.playbackIndex
speedType: chaserEditor.stepsDuration
tempoType: chaserEditor.tempoType
isRunning: chaserEditor.previewEnabled

0 comments on commit ddb18d9

Please sign in to comment.