diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index fe5251a2c..36849cd18 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -29,6 +29,8 @@ RepeatComboBox::RepeatComboBox(QWidget *parent, int & repeatParam): unsigned int step = IS_ARM(getCurrentBoard()) ? 1 : 10; int value = repeatParam/step; + setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); + if (step == 1) { addItem(QObject::tr("Played once, not during startup"), -1); value++; @@ -355,128 +357,149 @@ void CustomFunctionsPanel::onChildModified() void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified) { CustomFunctionData & cfn = functions[i]; - AssignFunc func = (AssignFunc)fswtchFunc[i]->itemData(fswtchFunc[i]->currentIndex()).toInt(); + AssignFunc func = (AssignFunc)fswtchFunc[i]->currentData().toInt(); unsigned int widgetsMask = 0; if (modified) { - cfn.swtch = RawSwitch(fswtchSwtch[i]->itemData(fswtchSwtch[i]->currentIndex()).toInt()); + cfn.swtch = RawSwitch(fswtchSwtch[i]->currentData().toInt()); cfn.func = func; cfn.enabled = fswtchEnable[i]->isChecked(); cfn.adjustMode = (AssignFunc)fswtchGVmode[i]->currentIndex(); } - if (func>=FuncOverrideCH1 && func<=FuncOverrideCH32) { - if (model) { - int channelsMax = model->getChannelsMax(true); - fswtchParam[i]->setDecimals(0); - fswtchParam[i]->setSingleStep(1); - fswtchParam[i]->setMinimum(-channelsMax); - fswtchParam[i]->setMaximum(channelsMax); - if (modified) { - cfn.param = fswtchParam[i]->value(); - } - fswtchParam[i]->setValue(cfn.param); - widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE; - } - } - else if (func==FuncLogs) { - fswtchParam[i]->setDecimals(1); - fswtchParam[i]->setMinimum(0); - fswtchParam[i]->setMaximum(25.5); - fswtchParam[i]->setSingleStep(0.1); - if (modified) cfn.param = fswtchParam[i]->value()*10.0; - fswtchParam[i]->setValue(cfn.param/10.0); - widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM; - } - else if (func>=FuncAdjustGV1 && func<=FuncAdjustGVLast) { - if (modified) cfn.adjustMode = fswtchGVmode[i]->currentIndex(); - widgetsMask |= CUSTOM_FUNCTION_GV_MODE | CUSTOM_FUNCTION_ENABLE; - if (cfn.adjustMode==FUNC_ADJUST_GVAR_CONSTANT || cfn.adjustMode==FUNC_ADJUST_GVAR_INCDEC) { - if (modified) cfn.param = fswtchParam[i]->value(); - fswtchParam[i]->setDecimals(0); - fswtchParam[i]->setSingleStep(1); - if (IS_ARM(getCurrentBoard())) { - fswtchParam[i]->setMinimum(-500); - fswtchParam[i]->setMaximum(500); - } - else { - fswtchParam[i]->setMinimum(-125); - fswtchParam[i]->setMaximum(125); - } - fswtchParam[i]->setValue(cfn.param); - widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM; - } - else { - if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt(); - populateFuncParamCB(fswtchParamT[i], func, cfn.param, cfn.adjustMode); - widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; - } - } - else if (func==FuncReset) { - if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt(); - populateFuncParamCB(fswtchParamT[i], func, cfn.param); - widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE; - } - else if (func>=FuncSetTimer1 && func<=FuncSetTimer3) { - if (modified) cfn.param = QTimeS(fswtchParamTime[i]->time()).seconds(); - fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0)); - fswtchParamTime[i]->setMaximumTime(firmware->getMaxTimerStart()); - fswtchParamTime[i]->setTime(QTimeS(cfn.param)); - widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE; - } - else if (func>=FuncSetFailsafeInternalModule && func<=FuncBindExternalModule) { - widgetsMask |= CUSTOM_FUNCTION_ENABLE; - } - else if (func==FuncVolume) { - if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt(); - populateFuncParamCB(fswtchParamT[i], func, cfn.param); - widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_ENABLE; - } - else if (func==FuncPlaySound || func==FuncPlayHaptic || func==FuncPlayValue || func==FuncPlayPrompt || func==FuncPlayBoth || func==FuncBackgroundMusic) { - if (func != FuncBackgroundMusic) { - widgetsMask |= CUSTOM_FUNCTION_REPEAT; - fswtchRepeat[i]->update(); - } - if (func==FuncPlayValue) { - if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt(); - populateFuncParamCB(fswtchParamT[i], func, cfn.param); - widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_REPEAT; - } - else if (func==FuncPlayPrompt || func==FuncPlayBoth) { - if (firmware->getCapability(VoicesAsNumbers)) { + if (cfn.swtch.toValue()){ + + if (func>=FuncOverrideCH1 && func<=FuncOverrideCH32) { + if (model) { + int channelsMax = model->getChannelsMax(true); fswtchParam[i]->setDecimals(0); fswtchParam[i]->setSingleStep(1); - fswtchParam[i]->setMinimum(0); - if (func==FuncPlayPrompt) { - widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT + CUSTOM_FUNCTION_GV_TOOGLE; - } - else { - widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT; - fswtchParamGV[i]->setChecked(false); - } - fswtchParam[i]->setMaximum(func==FuncPlayBoth ? 254 : 255); + fswtchParam[i]->setMinimum(-channelsMax); + fswtchParam[i]->setMaximum(channelsMax); if (modified) { - if (fswtchParamGV[i]->isChecked()) { - fswtchParam[i]->setMinimum(1); - cfn.param = std::min(fswtchParam[i]->value(),5.0)+(fswtchParamGV[i]->isChecked() ? 250 : 0); - } - else { - cfn.param = fswtchParam[i]->value(); - } + cfn.param = fswtchParam[i]->value(); } - if (cfn.param>250 && (func!=FuncPlayBoth)) { - fswtchParamGV[i]->setChecked(true); - fswtchParam[i]->setValue(cfn.param-250); - fswtchParam[i]->setMaximum(5); + fswtchParam[i]->setValue(cfn.param); + widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE; + } + } + else if (func==FuncLogs) { + fswtchParam[i]->setDecimals(1); + fswtchParam[i]->setMinimum(0); + fswtchParam[i]->setMaximum(25.5); + fswtchParam[i]->setSingleStep(0.1); + if (modified) + cfn.param = fswtchParam[i]->value()*10.0; + fswtchParam[i]->setValue(cfn.param/10.0); + widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM; + } + else if (func>=FuncAdjustGV1 && func<=FuncAdjustGVLast) { + if (modified) + cfn.adjustMode = fswtchGVmode[i]->currentIndex(); + widgetsMask |= CUSTOM_FUNCTION_GV_MODE | CUSTOM_FUNCTION_ENABLE; + if (cfn.adjustMode==FUNC_ADJUST_GVAR_CONSTANT || cfn.adjustMode==FUNC_ADJUST_GVAR_INCDEC) { + if (modified) + cfn.param = fswtchParam[i]->value(); + fswtchParam[i]->setDecimals(0); + fswtchParam[i]->setSingleStep(1); + if (IS_ARM(getCurrentBoard())) { + fswtchParam[i]->setMinimum(-500); + fswtchParam[i]->setMaximum(500); } else { - fswtchParamGV[i]->setChecked(false); - fswtchParam[i]->setValue(cfn.param); + fswtchParam[i]->setMinimum(-125); + fswtchParam[i]->setMaximum(125); } - if (cfn.param < 251) - widgetsMask |= CUSTOM_FUNCTION_PLAY; + fswtchParam[i]->setValue(cfn.param); + widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM; } else { + if (modified) + cfn.param = fswtchParamT[i]->currentData().toInt(); + populateFuncParamCB(fswtchParamT[i], func, cfn.param, cfn.adjustMode); + widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; + } + } + else if (func==FuncReset) { + if (modified) + cfn.param = fswtchParamT[i]->currentData().toInt(); + populateFuncParamCB(fswtchParamT[i], func, cfn.param); + widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE; + } + else if (func>=FuncSetTimer1 && func<=FuncSetTimer3) { + if (modified) + cfn.param = QTimeS(fswtchParamTime[i]->time()).seconds(); + fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0)); + fswtchParamTime[i]->setMaximumTime(firmware->getMaxTimerStart()); + fswtchParamTime[i]->setTime(QTimeS(cfn.param)); + widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE; + } + else if (func>=FuncSetFailsafeInternalModule && func<=FuncBindExternalModule) { + widgetsMask |= CUSTOM_FUNCTION_ENABLE; + } + else if (func==FuncVolume) { + if (modified) + cfn.param = fswtchParamT[i]->currentData().toInt(); + populateFuncParamCB(fswtchParamT[i], func, cfn.param); + widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_ENABLE; + } + else if (func==FuncPlaySound || func==FuncPlayHaptic || func==FuncPlayValue || func==FuncPlayPrompt || func==FuncPlayBoth || func==FuncBackgroundMusic) { + if (func != FuncBackgroundMusic) { + widgetsMask |= CUSTOM_FUNCTION_REPEAT; + fswtchRepeat[i]->update(); + } + if (func==FuncPlayValue) { + if (modified) + cfn.param = fswtchParamT[i]->currentData().toInt(); + populateFuncParamCB(fswtchParamT[i], func, cfn.param); + widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_REPEAT; + } + else if (func==FuncPlayPrompt || func==FuncPlayBoth) { + if (firmware->getCapability(VoicesAsNumbers)) { + fswtchParam[i]->setDecimals(0); + fswtchParam[i]->setSingleStep(1); + fswtchParam[i]->setMinimum(0); + if (func==FuncPlayPrompt) { + widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT + CUSTOM_FUNCTION_GV_TOOGLE; + } + else { + widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT; + fswtchParamGV[i]->setChecked(false); + } + fswtchParam[i]->setMaximum(func==FuncPlayBoth ? 254 : 255); + if (modified) { + if (fswtchParamGV[i]->isChecked()) { + fswtchParam[i]->setMinimum(1); + cfn.param = std::min(fswtchParam[i]->value(),5.0)+(fswtchParamGV[i]->isChecked() ? 250 : 0); + } + else { + cfn.param = fswtchParam[i]->value(); + } + } + if (cfn.param>250 && (func!=FuncPlayBoth)) { + fswtchParamGV[i]->setChecked(true); + fswtchParam[i]->setValue(cfn.param-250); + fswtchParam[i]->setMaximum(5); + } + else { + fswtchParamGV[i]->setChecked(false); + fswtchParam[i]->setValue(cfn.param); + } + if (cfn.param < 251) + widgetsMask |= CUSTOM_FUNCTION_PLAY; + } + else { + widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM; + if (modified) { + getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, firmware->getCapability(VoicesMaxLength)); + } + populateFileComboBox(fswtchParamArmT[i], tracksSet, cfn.paramarm); + if (fswtchParamArmT[i]->currentText() != "----") { + widgetsMask |= CUSTOM_FUNCTION_PLAY; + } + } + } + else if (func==FuncBackgroundMusic) { widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM; if (modified) { getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, firmware->getCapability(VoicesMaxLength)); @@ -486,50 +509,46 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified) widgetsMask |= CUSTOM_FUNCTION_PLAY; } } + else if (func==FuncPlaySound) { + if (modified) + cfn.param = (uint8_t)fswtchParamT[i]->currentIndex(); + populateFuncParamCB(fswtchParamT[i], func, cfn.param); + widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; + } + else if (func==FuncPlayHaptic) { + if (modified) + cfn.param = (uint8_t)fswtchParamT[i]->currentIndex(); + populateFuncParamCB(fswtchParamT[i], func, cfn.param); + widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; + } } - else if (func==FuncBackgroundMusic) { + else if (func==FuncPlayScript) { widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM; if (modified) { - getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, firmware->getCapability(VoicesMaxLength)); + getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, 8); } - populateFileComboBox(fswtchParamArmT[i], tracksSet, cfn.paramarm); - if (fswtchParamArmT[i]->currentText() != "----") { - widgetsMask |= CUSTOM_FUNCTION_PLAY; + populateFileComboBox(fswtchParamArmT[i], scriptsSet, cfn.paramarm); + } + else if (func==FuncBacklight && IS_TARANIS_PLUS(getCurrentBoard())) { + if (modified) + cfn.param = (uint8_t)fswtchBLcolor[i]->value(); + fswtchBLcolor[i]->setValue(cfn.param); + widgetsMask |= CUSTOM_FUNCTION_BL_COLOR; + } + else { + if (modified) + cfn.param = fswtchParam[i]->value(); + fswtchParam[i]->setDecimals(0); + fswtchParam[i]->setSingleStep(1); + fswtchParam[i]->setValue(cfn.param); + if (func <= FuncInstantTrim) { + widgetsMask |= CUSTOM_FUNCTION_ENABLE; } } - else if (func==FuncPlaySound) { - if (modified) cfn.param = (uint8_t)fswtchParamT[i]->currentIndex(); - populateFuncParamCB(fswtchParamT[i], func, cfn.param); - widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; - } - else if (func==FuncPlayHaptic) { - if (modified) cfn.param = (uint8_t)fswtchParamT[i]->currentIndex(); - populateFuncParamCB(fswtchParamT[i], func, cfn.param); - widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; - } - } - else if (func==FuncPlayScript) { - widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM; - if (modified) { - getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, 8); - } - populateFileComboBox(fswtchParamArmT[i], scriptsSet, cfn.paramarm); - } - else if (func==FuncBacklight && IS_TARANIS_PLUS(getCurrentBoard())) { - if (modified) cfn.param = (uint8_t)fswtchBLcolor[i]->value(); - fswtchBLcolor[i]->setValue(cfn.param); - widgetsMask |= CUSTOM_FUNCTION_BL_COLOR; - } - else { - if (modified) cfn.param = fswtchParam[i]->value(); - fswtchParam[i]->setDecimals(0); - fswtchParam[i]->setSingleStep(1); - fswtchParam[i]->setValue(cfn.param); - if (func <= FuncInstantTrim) { - widgetsMask |= CUSTOM_FUNCTION_ENABLE; - } + } + fswtchFunc[i]->setVisible(widgetsMask); fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM); fswtchParamTime[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_TIME_PARAM); fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE); diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp index 0e81ae84e..44629ca18 100644 --- a/companion/src/modeledit/logicalswitches.cpp +++ b/companion/src/modeledit/logicalswitches.cpp @@ -214,7 +214,7 @@ void LogicalSwitchesPanel::edited() if (oldFuncFamily != newFuncFamily) { model->logicalSw[i].clear(); - model->logicalSw[i].func = csw[i]->itemData(csw[i]->currentIndex()).toInt(); + model->logicalSw[i].func = csw[i]->currentData().toInt(); if (newFuncFamily == LS_FAMILY_TIMER) { model->logicalSw[i].val1 = -119; model->logicalSw[i].val2 = -119; @@ -249,7 +249,7 @@ void LogicalSwitchesPanel::edited() updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.1); break; case LS_FAMILY_EDGE: - cswitchOffset2[i]->setSpecialValueText(tr("(instant)")); + cswitchOffset2[i]->setSpecialValueText(" " + tr("(instant)")); if (sender() == cswitchOffset[i]) { model->logicalSw[i].val2 = TimToVal(cswitchOffset[i]->value()); updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0); @@ -259,7 +259,7 @@ void LogicalSwitchesPanel::edited() } updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1)); if (model->logicalSw[i].val3 == 0) { - cswitchOffset2[i]->setSuffix("(infinite)"); + cswitchOffset2[i]->setSuffix(" " + tr("(infinite)")); } else { cswitchOffset2[i]->setSuffix(""); @@ -297,74 +297,83 @@ void LogicalSwitchesPanel::updateTimerParam(QDoubleSpinBox *sb, int timer, doubl #define VALUE3_VISIBLE 0x10 #define VALUE_TO_VISIBLE 0x20 #define DELAY_ENABLED 0x40 +#define DURATION_ENABLED 0x80 void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i) { lock = true; + unsigned int mask; - unsigned int mask = DELAY_ENABLED; - RawSource source = RawSource(model->logicalSw[i].val1); - RawSourceRange range = source.getRange(model, generalSettings, model->logicalSw[i].getRangeFlags()); + if (!model->logicalSw[i].func) { + mask = 0; + } + else { + mask = DELAY_ENABLED | DURATION_ENABLED; - switch (model->logicalSw[i].getFunctionFamily()) - { - case LS_FAMILY_VOFS: - mask |= SOURCE1_VISIBLE; - populateSourceCB(cswitchSource1[i], source, generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0)); - cswitchOffset[i]->setDecimals(range.decimals); - cswitchOffset[i]->setSingleStep(range.step); - if (source.isTimeBased()) { - mask |= VALUE_TO_VISIBLE; - int maxTime = round(range.max); - int value = round(range.step*model->logicalSw[i].val2 + range.offset); - cswitchTOffset[i]->setMaximumTime(QTimeS(maxTime)); - QString format = (maxTime>=3600) ? "hh:mm:ss" : "mm:ss"; - if (!range.unit.isEmpty()) - format += QString("' [%1]'").arg(range.unit); - cswitchTOffset[i]->setDisplayFormat(format); - cswitchTOffset[i]->setTime(QTimeS(value)); + switch (model->logicalSw[i].getFunctionFamily()) + { + case LS_FAMILY_VOFS: + { + mask |= SOURCE1_VISIBLE; + RawSource source = RawSource(model->logicalSw[i].val1); + RawSourceRange range = source.getRange(model, generalSettings, model->logicalSw[i].getRangeFlags()); + populateSourceCB(cswitchSource1[i], source, generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0)); + cswitchOffset[i]->setDecimals(range.decimals); + cswitchOffset[i]->setSingleStep(range.step); + if (source.isTimeBased()) { + mask |= VALUE_TO_VISIBLE; + int maxTime = round(range.max); + int value = round(range.step*model->logicalSw[i].val2 + range.offset); + cswitchTOffset[i]->setMaximumTime(QTimeS(maxTime)); + QString format = (maxTime>=3600) ? "hh:mm:ss" : "mm:ss"; + if (!range.unit.isEmpty()) + format += QString("' [%1]'").arg(range.unit); + cswitchTOffset[i]->setDisplayFormat(format); + cswitchTOffset[i]->setTime(QTimeS(value)); + } + else { + mask |= VALUE2_VISIBLE; + if (range.unit.isEmpty()) + cswitchOffset[i]->setSuffix(""); + else + cswitchOffset[i]->setSuffix(" " + range.unit); + cswitchOffset[i]->setMinimum(range.min); + cswitchOffset[i]->setMaximum(range.max); + cswitchOffset[i]->setValue(range.step*(model->logicalSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset); + } + break; } - else { - mask |= VALUE2_VISIBLE; - if (range.unit.isEmpty()) - cswitchOffset[i]->setSuffix(""); - else - cswitchOffset[i]->setSuffix(" " + range.unit); - cswitchOffset[i]->setMinimum(range.min); - cswitchOffset[i]->setMaximum(range.max); - cswitchOffset[i]->setValue(range.step*(model->logicalSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset); - } - break; - case LS_FAMILY_STICKY: - // no break - case LS_FAMILY_VBOOL: - mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE; - populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext); - populateSwitchCB(cswitchSource2[i], RawSwitch(model->logicalSw[i].val2), generalSettings, LogicalSwitchesContext); - break; - case LS_FAMILY_EDGE: - mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE | VALUE3_VISIBLE; - mask &= ~DELAY_ENABLED; - populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext); - updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0); - updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1)); - cswitchOffset2[i]->setSpecialValueText(tr("(instant)")); - if (model->logicalSw[i].val3 == 0) { - cswitchOffset2[i]->setSuffix(tr("(infinite)")); - } - else { - cswitchOffset2[i]->setSuffix(""); - } - break; - case LS_FAMILY_VCOMP: - mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE; - populateSourceCB(cswitchSource1[i], RawSource(model->logicalSw[i].val1), generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0)); - populateSourceCB(cswitchSource2[i], RawSource(model->logicalSw[i].val2), generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0)); - break; - case LS_FAMILY_TIMER: - mask |= VALUE1_VISIBLE | VALUE2_VISIBLE; - updateTimerParam(cswitchValue[i], model->logicalSw[i].val1, 0.1); - updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.1); + case LS_FAMILY_STICKY: + // no break + case LS_FAMILY_VBOOL: + mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE; + populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext); + populateSwitchCB(cswitchSource2[i], RawSwitch(model->logicalSw[i].val2), generalSettings, LogicalSwitchesContext); + break; + case LS_FAMILY_EDGE: + mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE | VALUE3_VISIBLE; + mask &= ~DELAY_ENABLED; + populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext); + updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0); + updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1)); + cswitchOffset2[i]->setSpecialValueText(tr("(instant)")); + if (model->logicalSw[i].val3 == 0) { + cswitchOffset2[i]->setSuffix(tr("(infinite)")); + } + else { + cswitchOffset2[i]->setSuffix(""); + } + break; + case LS_FAMILY_VCOMP: + mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE; + populateSourceCB(cswitchSource1[i], RawSource(model->logicalSw[i].val1), generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0)); + populateSourceCB(cswitchSource2[i], RawSource(model->logicalSw[i].val2), generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0)); + break; + case LS_FAMILY_TIMER: + mask |= VALUE1_VISIBLE | VALUE2_VISIBLE; + updateTimerParam(cswitchValue[i], model->logicalSw[i].val1, 0.1); + updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.1); + } } cswitchSource1[i]->setVisible(mask & SOURCE1_VISIBLE); @@ -374,9 +383,12 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i) cswitchOffset2[i]->setVisible(mask & VALUE3_VISIBLE); cswitchTOffset[i]->setVisible(mask & VALUE_TO_VISIBLE); if (firmware->getCapability(LogicalSwitchesExt)) { - cswitchDelay[i]->setEnabled(mask & DELAY_ENABLED); - cswitchDuration[i]->setValue(model->logicalSw[i].duration/10.0); - cswitchDelay[i]->setValue(model->logicalSw[i].delay/10.0); + cswitchDuration[i]->setVisible(mask & DURATION_ENABLED); + cswitchDelay[i]->setVisible(mask & DELAY_ENABLED); + if (mask & DURATION_ENABLED) + cswitchDuration[i]->setValue(model->logicalSw[i].duration/10.0); + if (mask & DELAY_ENABLED) + cswitchDelay[i]->setValue(model->logicalSw[i].delay/10.0); } lock = false; } @@ -425,8 +437,13 @@ void LogicalSwitchesPanel::populateCSWCB(QComboBox *b, int value) b->setMaxVisibleItems(10); } -void LogicalSwitchesPanel::populateAndSwitchCB(QComboBox *b, const RawSwitch & value) +void LogicalSwitchesPanel::populateAndSwitchCB(QComboBox *b, const RawSwitch & value, const int idx) { + if (!model->logicalSw[idx].func) { + b->setVisible(false); + return; + } + if (IS_ARM(firmware->getBoard())) { populateSwitchCB(b, value, generalSettings, LogicalSwitchesContext); } @@ -451,6 +468,7 @@ void LogicalSwitchesPanel::populateAndSwitchCB(QComboBox *b, const RawSwitch & v if (item == value) b->setCurrentIndex(b->count()-1); } } + b->setVisible(true); } void LogicalSwitchesPanel::updateLine(int i) @@ -460,7 +478,7 @@ void LogicalSwitchesPanel::updateLine(int i) lock = true; setSwitchWidgetVisibility(i); lock = true; - populateAndSwitchCB(cswitchAnd[i], RawSwitch(model->logicalSw[i].andsw)); + populateAndSwitchCB(cswitchAnd[i], RawSwitch(model->logicalSw[i].andsw), i); lock = false; } diff --git a/companion/src/modeledit/logicalswitches.h b/companion/src/modeledit/logicalswitches.h index 8ac3e3693..ea7ab1e56 100644 --- a/companion/src/modeledit/logicalswitches.h +++ b/companion/src/modeledit/logicalswitches.h @@ -62,7 +62,7 @@ class LogicalSwitchesPanel : public ModelPanel int selectedSwitch; void populateCSWCB(QComboBox *b, int value); - void populateAndSwitchCB(QComboBox *b, const RawSwitch & value); + void populateAndSwitchCB(QComboBox *b, const RawSwitch & value, const int idx); void updateLine(int index); void updateTimerParam(QDoubleSpinBox *sb, int timer, double minimum=0);