diff --git a/companion/src/datamodels/compounditemmodels.cpp b/companion/src/datamodels/compounditemmodels.cpp
index aa3fa1756..ab0ba83ba 100644
--- a/companion/src/datamodels/compounditemmodels.cpp
+++ b/companion/src/datamodels/compounditemmodels.cpp
@@ -111,7 +111,6 @@ RawSourceItemModel::RawSourceItemModel(const GeneralSettings * const generalSett
addItems(SOURCE_TYPE_LUA_OUTPUT, RawSource::ScriptsGroup, firmware->getCapability(LuaOutputsPerScript), i * 16);
addItems(SOURCE_TYPE_VIRTUAL_INPUT, RawSource::InputsGroup, firmware->getCapability(VirtualInputs));
addItems(SOURCE_TYPE_STICK, RawSource::SourcesGroup, board->getCapability(Board::MaxAnalogs));
- addItems(SOURCE_TYPE_ROTARY_ENCODER, RawSource::SourcesGroup, firmware->getCapability(RotaryEncoders));
addItems(SOURCE_TYPE_TRIM, RawSource::TrimsGroup, board->getCapability(Board::NumTrims));
addItems(SOURCE_TYPE_MAX, RawSource::SourcesGroup, 1);
addItems(SOURCE_TYPE_SWITCH, RawSource::SwitchesGroup, board->getCapability(Board::Switches));
@@ -172,7 +171,6 @@ RawSwitchItemModel::RawSwitchItemModel(const GeneralSettings * const generalSett
addItems(SWITCH_TYPE_TELEMETRY, -1);
addItems(SWITCH_TYPE_FLIGHT_MODE, -firmware->getCapability(FlightModes));
addItems(SWITCH_TYPE_VIRTUAL, -firmware->getCapability(LogicalSwitches));
- addItems(SWITCH_TYPE_ROTARY_ENCODER, -firmware->getCapability(RotaryEncoders));
addItems(SWITCH_TYPE_TRIM, -board->getCapability(Board::NumTrimSwitches));
addItems(SWITCH_TYPE_MULTIPOS_POT, -(board->getCapability(Board::MultiposPots) * board->getCapability(Board::MultiposPotsPositions)));
addItems(SWITCH_TYPE_SWITCH, -board->getCapability(Board::SwitchPositions));
@@ -183,7 +181,6 @@ RawSwitchItemModel::RawSwitchItemModel(const GeneralSettings * const generalSett
addItems(SWITCH_TYPE_SWITCH, board->getCapability(Board::SwitchPositions));
addItems(SWITCH_TYPE_MULTIPOS_POT, board->getCapability(Board::MultiposPots) * board->getCapability(Board::MultiposPotsPositions));
addItems(SWITCH_TYPE_TRIM, board->getCapability(Board::NumTrimSwitches));
- addItems(SWITCH_TYPE_ROTARY_ENCODER, firmware->getCapability(RotaryEncoders));
addItems(SWITCH_TYPE_VIRTUAL, firmware->getCapability(LogicalSwitches));
addItems(SWITCH_TYPE_FLIGHT_MODE, firmware->getCapability(FlightModes));
addItems(SWITCH_TYPE_TELEMETRY, 1);
@@ -422,7 +419,7 @@ CustomFuncActionItemModel::CustomFuncActionItemModel(const GeneralSettings * con
void CustomFuncActionItemModel::setDynamicItemData(QStandardItem * item, const int value) const
{
- item->setText(CustomFunctionData(AssignFunc(value)).funcToString(modelData));
+ item->setText(CustomFunctionData::funcToString((AssignFunc)value, modelData));
item->setData(CustomFunctionData::isFuncAvailable(value), IMDR_Available);
}
@@ -449,7 +446,7 @@ CustomFuncResetParamItemModel::CustomFuncResetParamItemModel(const GeneralSettin
setId(IMID_CustomFuncResetParam);
setUpdateMask(IMUE_TeleSensors);
- for (int i = 0; i < CustomFunctionData::resetParamCount(modelData); i++) {
+ for (int i = 0; i < CustomFunctionData::resetParamCount(); i++) {
QStandardItem * modelItem = new QStandardItem();
modelItem->setData(i, IMDR_Id);
setDynamicItemData(modelItem, i);
@@ -459,10 +456,8 @@ CustomFuncResetParamItemModel::CustomFuncResetParamItemModel(const GeneralSettin
void CustomFuncResetParamItemModel::setDynamicItemData(QStandardItem * item, const int value) const
{
- CustomFunctionData cfd = CustomFunctionData(AssignFunc::FuncReset);
- cfd.param = value;
- item->setText(cfd.paramToString(modelData));
- item->setData(CustomFunctionData::isResetParamAvailable(modelData, value), IMDR_Available);
+ item->setText(CustomFunctionData::resetToString(value, modelData));
+ item->setData(CustomFunctionData::isResetParamAvailable(value, modelData), IMDR_Available);
}
void CustomFuncResetParamItemModel::update(const int event)
diff --git a/companion/src/firmwares/customfunctiondata.cpp b/companion/src/firmwares/customfunctiondata.cpp
index d4942c60c..98157cae2 100644
--- a/companion/src/firmwares/customfunctiondata.cpp
+++ b/companion/src/firmwares/customfunctiondata.cpp
@@ -22,6 +22,17 @@
#include "eeprominterface.h"
#include "radiodata.h"
#include "radiodataconversionstate.h"
+#include "compounditemmodels.h"
+
+void CustomFunctionData::convert(RadioDataConversionState & cstate)
+{
+ cstate.setComponent(tr("CFN"), 8);
+ cstate.setSubComp(nameToString(cstate.subCompIdx, (cstate.toModel() ? false : true)));
+ swtch.convert(cstate);
+ if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && adjustMode == 1)) {
+ param = RawSource(param).convert(cstate.withComponentField("PARAM")).toValue();
+ }
+}
void CustomFunctionData::clear()
{
@@ -36,12 +47,19 @@ bool CustomFunctionData::isEmpty() const
return (swtch.type == SWITCH_TYPE_NONE);
}
-QString CustomFunctionData::nameToString(int index, bool globalContext) const
+// static
+QString CustomFunctionData::nameToString(const int index, const bool globalContext)
{
return RadioData::getElementName((globalContext ? tr("GF") : tr("SF")), index + 1, 0, true);
}
QString CustomFunctionData::funcToString(const ModelData * model) const
+{
+ return funcToString(func, model);
+}
+
+// static
+QString CustomFunctionData::funcToString(const AssignFunc func, const ModelData * model)
{
if (func >= FuncOverrideCH1 && func <= FuncOverrideCHLast)
return tr("Override %1").arg(RawSource(SOURCE_TYPE_CH, func).toString(model));
@@ -76,7 +94,7 @@ QString CustomFunctionData::funcToString(const ModelData * model) const
else if (func == FuncPlayValue)
return tr("Play Value");
else if (func == FuncPlayScript)
- return tr("Play Script");
+ return tr("Lua Script");
else if (func == FuncLogs)
return tr("SD Logs");
else if (func == FuncVolume)
@@ -94,9 +112,9 @@ QString CustomFunctionData::funcToString(const ModelData * model) const
else if (func == FuncSetFailsafe)
return tr("Set Failsafe");
else if (func == FuncRangeCheckInternalModule)
- return tr("RangeCheck Int. Module");
+ return tr("Range Check Int. Module");
else if (func == FuncRangeCheckExternalModule)
- return tr("RangeCheck Ext. Module");
+ return tr("Range Check Ext. Module");
else if (func == FuncBindInternalModule)
return tr("Bind Int. Module");
else if (func == FuncBindExternalModule)
@@ -106,53 +124,6 @@ QString CustomFunctionData::funcToString(const ModelData * model) const
}
}
-void CustomFunctionData::populateResetParams(const ModelData * model, QComboBox * b, unsigned int value = 0)
-{
- int val = 0;
- Firmware * firmware = Firmware::getCurrentVariant();
-
- for (int i = 0; i < CPN_MAX_TIMERS; i++, val++) {
- if (i < firmware->getCapability(Timers)) {
- RawSource item = RawSource(SOURCE_TYPE_SPECIAL, i + SOURCE_TYPE_SPECIAL_TIMER1_IDX);
- b->addItem(item.toString(model), val);
- }
- }
-
- b->addItem(tr("Flight"), val++);
- b->addItem(tr("Telemetry"), val++);
-
- int reCount = firmware->getCapability(RotaryEncoders);
- if (reCount == 1) {
- b->addItem(tr("Rotary Encoder"), val++);
- }
- else if (reCount == 2) {
- b->addItem(tr("REa"), val++);
- b->addItem(tr("REb"), val++);
- }
-
- if (model) {
- for (int i = 0; i < firmware->getCapability(Sensors); ++i) {
- if (model->sensorData[i].isAvailable()) {
- RawSource item = RawSource(SOURCE_TYPE_TELEMETRY, 3 * i);
- b->addItem(item.toString(model), val + i);
- }
- }
- }
-
- b->setCurrentIndex(b->findData(value));
-}
-
-void CustomFunctionData::populatePlaySoundParams(QStringList & qs)
-{
- qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
- qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt" << "AlmClk" ;
-}
-
-void CustomFunctionData::populateHapticParams(QStringList & qs)
-{
- qs << "0" << "1" << "2" << "3";
-}
-
QString CustomFunctionData::paramToString(const ModelData * model) const
{
QStringList qs;
@@ -163,31 +134,16 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
return QString("%1").arg(param / 10.0) + tr("s");
}
else if (func == FuncPlaySound) {
- CustomFunctionData::populatePlaySoundParams(qs);
- if (param >= 0 && param < (int)qs.count())
- return qs.at(param);
- else
- return tr("Inconsistent parameter");
+ return playSoundToString(param);
}
else if (func == FuncPlayHaptic) {
- CustomFunctionData::populateHapticParams(qs);
- if (param >= 0 && param < (int)qs.count())
- return qs.at(param);
- else
- return tr("Inconsistent parameter");
+ return harpicToString(param);
}
else if (func == FuncReset) {
- QComboBox cb;
- CustomFunctionData::populateResetParams(model, &cb);
- int pos = cb.findData(param);
- if (pos >= 0)
- return cb.itemText(pos);
- else
- return tr("Inconsistent parameter");
+ return resetToString(param, model);
}
else if (func == FuncVolume || func == FuncPlayValue || func == FuncBacklight) {
- RawSource item(param);
- return item.toString(model);
+ return RawSource(param).toString(model);
}
else if (func == FuncPlayPrompt || func == FuncPlayBoth) {
if ( getCurrentFirmware()->getCapability(VoicesAsNumbers)) {
@@ -200,16 +156,14 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
else if (func >= FuncAdjustGV1 && func < FuncCount) {
switch (adjustMode) {
case FUNC_ADJUST_GVAR_CONSTANT:
- return tr("Value ") + QString("%1").arg(param);
+ return gvarAdjustModeToString(adjustMode) + QString(" %1").arg(param);
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_GVAR:
return RawSource(param).toString();
case FUNC_ADJUST_GVAR_INCDEC:
- float val;
- QString unit;
- val = param * model->gvarData[func - FuncAdjustGV1].multiplierGet();
- unit = model->gvarData[func - FuncAdjustGV1].unitToString();
- return QString("Increment: %1%2").arg(val).arg(unit);
+ const float val = param * model->gvarData[func - FuncAdjustGV1].multiplierGet();
+ const QString unit = model->gvarData[func - FuncAdjustGV1].unitToString();
+ return gvarAdjustModeToString(adjustMode) + QString(": %1%2").arg(val).arg(unit);
}
}
return "";
@@ -217,15 +171,20 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
QString CustomFunctionData::repeatToString() const
{
- if (repeatParam == -1) {
- return tr("played once, not during startup");
+ return repeatToString(repeatParam);
+}
+
+// static
+QString CustomFunctionData::repeatToString(const int value)
+{
+ if (value == -1) {
+ return tr("Played once, not during startup");
}
- else if (repeatParam == 0) {
- return "";
+ else if (value == 0) {
+ return tr("No repeat");
}
else {
- unsigned int step = 1;
- return tr("repeat(%1s)").arg(step * repeatParam);
+ return tr("Repeat %1s").arg(value);
}
}
@@ -246,7 +205,7 @@ QString CustomFunctionData::enabledToString() const
}
// static
-bool CustomFunctionData::isFuncAvailable(int index)
+bool CustomFunctionData::isFuncAvailable(const int index)
{
Firmware * fw = getCurrentFirmware();
@@ -265,7 +224,7 @@ bool CustomFunctionData::isFuncAvailable(int index)
}
// static
-int CustomFunctionData::funcContext(int index)
+int CustomFunctionData::funcContext(const int index)
{
int ret = AllFunctionContexts;
@@ -276,16 +235,42 @@ int CustomFunctionData::funcContext(int index)
return ret;
}
+
// static
-int CustomFunctionData::resetParamCount(const ModelData * model)
+QString CustomFunctionData::resetToString(const int value, const ModelData * model)
{
- QComboBox cb;
- CustomFunctionData::populateResetParams(model, &cb);
- return cb.count();
+ Firmware * firmware = getCurrentFirmware();
+ int step = CPN_MAX_TIMERS;
+
+ if (value < step) {
+ if (value < firmware->getCapability(Timers))
+ return RawSource(SOURCE_TYPE_SPECIAL, value + SOURCE_TYPE_SPECIAL_TIMER1_IDX).toString(model);
+ else
+ return QString(CPN_STR_UNKNOWN_ITEM);
+ }
+
+ if (value < ++step)
+ return tr("Flight");
+
+ if (value < ++step)
+ return tr("Telemetry");
+
+ if (value < step + firmware->getCapability(Sensors))
+ return RawSource(SOURCE_TYPE_TELEMETRY, 3 * (value - step)).toString(model);
+
+ return QString(CPN_STR_UNKNOWN_ITEM);
}
// static
-bool CustomFunctionData::isResetParamAvailable(const ModelData * model, int index)
+int CustomFunctionData::resetParamCount()
+{
+ Firmware * firmware = getCurrentFirmware();
+
+ return CPN_MAX_TIMERS + 2 + firmware->getCapability(Sensors);
+}
+
+// static
+bool CustomFunctionData::isResetParamAvailable(const int index, const ModelData * model)
{
Firmware * firmware = getCurrentFirmware();
@@ -295,20 +280,121 @@ bool CustomFunctionData::isResetParamAvailable(const ModelData * model, int inde
else
return false;
}
- else if (index < CPN_MAX_TIMERS + firmware->getCapability(RotaryEncoders))
+ else if (index < CPN_MAX_TIMERS + 2)
return true;
- else if (model && index < CPN_MAX_TIMERS + firmware->getCapability(RotaryEncoders) + firmware->getCapability(Sensors))
- return model->sensorData[index - CPN_MAX_TIMERS - firmware->getCapability(RotaryEncoders)].isAvailable();
+ else if (model && index < resetParamCount())
+ return model->sensorData[index - (CPN_MAX_TIMERS + 2)].isAvailable();
return false;
}
-void CustomFunctionData::convert(RadioDataConversionState & cstate)
+QString CustomFunctionData::harpicToString() const
{
- cstate.setComponent(tr("CFN"), 8);
- cstate.setSubComp(nameToString(cstate.subCompIdx, (cstate.toModel() ? false : true)));
- swtch.convert(cstate);
- if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && adjustMode == 1)) {
- param = RawSource(param).convert(cstate.withComponentField("PARAM")).toValue();
+ return harpicToString(param);
+}
+
+// static
+QString CustomFunctionData::harpicToString(const int value)
+{
+ return QString("%1").arg(value);
+}
+
+// static
+QStringList CustomFunctionData::playSoundStringList()
+{
+ return QStringList({ tr("Beep 1"), tr("Beep 2"), tr("Beep 3"), tr("Warn 1"), tr("Warn 2"), tr("Cheep"), tr("Ratata"), tr("Tick"),
+ tr("Siren"), tr("Ring"), tr("Sci Fi"), tr("Robot"), tr("Chirp"), tr("Tada"), tr("Cricket"), tr("Alarm Clock") });
+}
+
+QString CustomFunctionData::playSoundToString() const
+{
+ return playSoundToString(param);
+}
+
+// static
+QString CustomFunctionData::playSoundToString(const int value)
+{
+ const QStringList strl = playSoundStringList();
+ if (value < strl.count())
+ return strl.at(value);
+ else
+ return QString(CPN_STR_UNKNOWN_ITEM);
+}
+
+QString CustomFunctionData::gvarAdjustModeToString() const
+{
+ return gvarAdjustModeToString(adjustMode);
+}
+
+// static
+QString CustomFunctionData::gvarAdjustModeToString(const int value)
+{
+ switch (value) {
+ case FUNC_ADJUST_GVAR_CONSTANT:
+ return tr("Value");
+ case FUNC_ADJUST_GVAR_SOURCE:
+ return tr("Source");
+ case FUNC_ADJUST_GVAR_GVAR:
+ return tr("Global Variable");
+ case FUNC_ADJUST_GVAR_INCDEC:
+ return tr("Inc/Decrement");
+ default:
+ return QString(CPN_STR_UNKNOWN_ITEM);
}
}
+
+// static
+AbstractStaticItemModel * CustomFunctionData::repeatItemModel()
+{
+ AbstractStaticItemModel * mdl = new AbstractStaticItemModel();
+ mdl->setName("customfunctiondata.repeat");
+
+ for (int i = -1; i <= 60; i++) {
+ mdl->appendToItemList(repeatToString(i), i);
+ }
+
+ mdl->loadItemList();
+ return mdl;
+}
+
+// static
+AbstractStaticItemModel * CustomFunctionData::playSoundItemModel()
+{
+ AbstractStaticItemModel * mdl = new AbstractStaticItemModel();
+ mdl->setName("customfunctiondata.playsound");
+
+ for (int i = 0; i < playSoundStringList().count(); i++) {
+ mdl->appendToItemList(playSoundToString(i), i);
+ }
+
+ mdl->loadItemList();
+ return mdl;
+}
+
+// static
+AbstractStaticItemModel * CustomFunctionData::harpicItemModel()
+{
+ AbstractStaticItemModel * mdl = new AbstractStaticItemModel();
+ mdl->setName("customfunctiondata.harpic");
+
+ for (int i = 0; i <= 3; i++) {
+ mdl->appendToItemList(harpicToString(i), i);
+ }
+
+ mdl->loadItemList();
+ return mdl;
+}
+
+// static
+AbstractStaticItemModel * CustomFunctionData::gvarAdjustModeItemModel()
+{
+ AbstractStaticItemModel * mdl = new AbstractStaticItemModel();
+ mdl->setName("customfunctiondata.gvaradjustmode");
+
+ for (int i = 0; i < FUNC_ADJUST_GVAR_COUNT; i++) {
+ mdl->appendToItemList(gvarAdjustModeToString(i), i);
+ }
+
+ mdl->loadItemList();
+ return mdl;
+}
diff --git a/companion/src/firmwares/customfunctiondata.h b/companion/src/firmwares/customfunctiondata.h
index 9e597441f..d5a08a96f 100644
--- a/companion/src/firmwares/customfunctiondata.h
+++ b/companion/src/firmwares/customfunctiondata.h
@@ -18,8 +18,7 @@
* GNU General Public License for more details.
*/
-#ifndef CUSTOMFUNCTIONDATA_H
-#define CUSTOMFUNCTIONDATA_H
+#pragma once
#include "boards.h"
#include "constants.h"
@@ -32,6 +31,7 @@ class Firmware;
class ModelData;
class GeneralSettings;
class RadioDataConversionState;
+class AbstractStaticItemModel;
enum AssignFunc {
FuncOverrideCH1 = 0,
@@ -78,7 +78,8 @@ enum GVarAdjustModes
FUNC_ADJUST_GVAR_CONSTANT,
FUNC_ADJUST_GVAR_SOURCE,
FUNC_ADJUST_GVAR_GVAR,
- FUNC_ADJUST_GVAR_INCDEC
+ FUNC_ADJUST_GVAR_INCDEC,
+ FUNC_ADJUST_GVAR_COUNT
};
class CustomFunctionData {
@@ -102,25 +103,33 @@ class CustomFunctionData {
unsigned int adjustMode;
int repeatParam;
- void clear();
- bool isEmpty() const;
- QString nameToString(int index, bool globalContext = false) const;
- QString funcToString(const ModelData * model = nullptr) const;
- QString paramToString(const ModelData * model) const;
- QString repeatToString() const;
- QString enabledToString() const;
-
- static void populateResetParams(const ModelData * model, QComboBox * b, unsigned int value);
- static void populatePlaySoundParams(QStringList & qs);
- static void populateHapticParams(QStringList & qs);
- static bool isFuncAvailable(int index);
- static int funcContext(int index);
- static int resetParamCount(const ModelData * model);
- static bool isResetParamAvailable(const ModelData * model, int index);
-
void convert(RadioDataConversionState & cstate);
+ void clear();
+ bool isEmpty() const;
+ QString funcToString(const ModelData * model = nullptr) const;
+ QString paramToString(const ModelData * model = nullptr) const;
+ QString repeatToString() const;
+ QString enabledToString() const;
+ QString playSoundToString() const;
+ QString harpicToString() const;
+ QString gvarAdjustModeToString() const;
+
+ static QString nameToString(const int index, const bool globalContext = false);
+ static QString funcToString(const AssignFunc func, const ModelData * model = nullptr);
+ static bool isFuncAvailable(const int index);
+ static int funcContext(const int index);
+ static QString resetToString(const int value, const ModelData * model = nullptr);
+ static int resetParamCount();
+ static bool isResetParamAvailable(const int index, const ModelData * model = nullptr);
+ static QString repeatToString(const int value);
+ static QStringList playSoundStringList();
+ static QString playSoundToString(const int value);
+ static QString harpicToString(const int value);
+ static QStringList gvarAdjustModeStringList();
+ static QString gvarAdjustModeToString(const int value);
+ static AbstractStaticItemModel * repeatItemModel();
+ static AbstractStaticItemModel * playSoundItemModel();
+ static AbstractStaticItemModel * harpicItemModel();
+ static AbstractStaticItemModel * gvarAdjustModeItemModel();
};
-
-
-#endif // CUSTOMFUNCTIONDATA_H
diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp
index 5c15bd538..c773e90e5 100644
--- a/companion/src/modeledit/customfunctions.cpp
+++ b/companion/src/modeledit/customfunctions.cpp
@@ -19,53 +19,11 @@
*/
#include "customfunctions.h"
-#include "filtereditemmodels.h"
#include "helpers.h"
#include "appdata.h"
#include
-RepeatComboBox::RepeatComboBox(QWidget *parent, int & repeatParam):
- QComboBox(parent),
- repeatParam(repeatParam)
-{
- unsigned int step = 1;
- int value = repeatParam/step;
-
- setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-
- if (step == 1) {
- addItem(tr("Played once, not during startup"), -1);
- value++;
- }
-
- addItem(tr("No repeat"), 0);
-
- for (unsigned int i = step; i <= 60; i += step) {
- addItem(tr("%1s").arg(i), i);
- }
-
- setCurrentIndex(value);
-
- connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(onIndexChanged(int)));
-}
-
-void RepeatComboBox::onIndexChanged(int index)
-{
- repeatParam = itemData(index).toInt();
- emit modified();
-}
-
-void RepeatComboBox::update()
-{
- unsigned int step = 1;
- int value = repeatParam/step;
- if (step == 1) {
- value++;
- }
- setCurrentIndex(value);
-}
-
CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model, GeneralSettings & generalSettings, Firmware * firmware,
CompoundItemModelFactory * sharedItemModels):
GenericPanel(parent, model, generalSettings, firmware),
@@ -77,18 +35,41 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
lock = true;
fswCapability = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
- rawSwitchFilteredModel = new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSwitch),
- model ? RawSwitch::SpecialFunctionsContext : RawSwitch::GlobalFunctionsContext);
- connectItemModelEvents(rawSwitchFilteredModel);
+ tabModelFactory = new CompoundItemModelFactory(&generalSettings, model);
+ playSoundId = tabModelFactory->registerItemModel(CustomFunctionData::playSoundItemModel());
+ harpicId = tabModelFactory->registerItemModel(CustomFunctionData::harpicItemModel());
+ repeatId = tabModelFactory->registerItemModel(CustomFunctionData::repeatItemModel());
+ gvarAdjustModeId = tabModelFactory->registerItemModel(CustomFunctionData::gvarAdjustModeItemModel());
- rawSourceAllModel = new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource));
- connectItemModelEvents(rawSourceAllModel);
+ tabFilterFactory = new FilteredItemModelFactory();
- rawSourceInputsModel = new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource), RawSource::InputSourceGroups);
- connectItemModelEvents(rawSourceInputsModel);
+ funcActionsId = tabFilterFactory->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_CustomFuncAction),
+ model ? CustomFunctionData::AllFunctionContexts : CustomFunctionData::GlobalFunctionsContext),
+ "Function Actions");
+ connectItemModelEvents(tabFilterFactory->getItemModel(funcActionsId));
- rawSourceGVarsModel = new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource), RawSource::GVarsGroup);
- connectItemModelEvents(rawSourceGVarsModel);
+ funcResetParamId = tabFilterFactory->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_CustomFuncResetParam)),
+ "Reset Params");
+ connectItemModelEvents(tabFilterFactory->getItemModel(funcResetParamId));
+
+ rawSwitchId = tabFilterFactory->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSwitch),
+ model ? RawSwitch::SpecialFunctionsContext : RawSwitch::GlobalFunctionsContext),
+ "RawSwitch");
+ connectItemModelEvents(tabFilterFactory->getItemModel(rawSwitchId));
+
+ rawSourceAllId = tabFilterFactory->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource)),
+ "RawSource All");
+ connectItemModelEvents(tabFilterFactory->getItemModel(rawSourceAllId));
+
+ rawSourceInputsId = tabFilterFactory->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
+ RawSource::InputSourceGroups),
+ "RawSource Inputs");
+ connectItemModelEvents(tabFilterFactory->getItemModel(rawSourceInputsId));
+
+ rawSourceGVarsId = tabFilterFactory->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
+ RawSource::GVarsGroup),
+ "RawSource GVars");
+ connectItemModelEvents(tabFilterFactory->getItemModel(rawSourceGVarsId));
if (!firmware->getCapability(VoicesAsNumbers)) {
tracksSet = getFilesSet(getSoundsPath(generalSettings), QStringList() << "*.wav" << "*.WAV", firmware->getCapability(VoicesMaxLength));
@@ -118,7 +99,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
playIcon.addImage("stop.png", QIcon::Normal, QIcon::On);
QStringList headerLabels;
- headerLabels << "#" << tr("Switch") << tr("Action") << tr("Parameters") << tr("Enable");
+ headerLabels << "#" << tr("Switch") << tr("Action") << tr("Parameters") << "";
TableLayout * tableLayout = new TableLayout(this, fswCapability, headerLabels);
for (int i = 0; i < fswCapability; i++) {
@@ -135,32 +116,26 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onCustomContextMenuRequested(QPoint)));
tableLayout->addWidget(i, 0, label);
- // s1.report("label");
// The switch
fswtchSwtch[i] = new QComboBox(this);
- fswtchSwtch[i]->setModel(rawSwitchFilteredModel);
- fswtchSwtch[i]->setCurrentIndex(fswtchSwtch[i]->findData(functions[i].swtch.toValue()));
fswtchSwtch[i]->setProperty("index", i);
+ fswtchSwtch[i]->setModel(tabFilterFactory->getItemModel(rawSwitchId));
+ fswtchSwtch[i]->setCurrentIndex(fswtchSwtch[i]->findData(functions[i].swtch.toValue()));
fswtchSwtch[i]->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
+ fswtchSwtch[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
fswtchSwtch[i]->setMaxVisibleItems(10);
connect(fswtchSwtch[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
tableLayout->addWidget(i, 1, fswtchSwtch[i]);
- // s1.report("switch");
// The function
fswtchFunc[i] = new QComboBox(this);
- if (!i) {
- populateFuncCB(fswtchFunc[i], functions[i].func);
- }
- else {
- fswtchFunc[i]->setModel(fswtchFunc[0]->model());
- fswtchFunc[i]->setCurrentIndex(fswtchFunc[i]->findData(functions[i].func));
- }
fswtchFunc[i]->setProperty("index", i);
+ fswtchFunc[i]->setModel(tabFilterFactory->getItemModel(funcActionsId));
+ fswtchFunc[i]->setCurrentIndex(fswtchFunc[i]->findData(functions[i].func));
+ fswtchFunc[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(functionEdited()));
tableLayout->addWidget(i, 2, fswtchFunc[i]);
- // s1.report("func");
// The parameters
QHBoxLayout * paramLayout = new QHBoxLayout();
@@ -168,15 +143,15 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
fswtchGVmode[i] = new QComboBox(this);
fswtchGVmode[i]->setProperty("index", i);
- populateGVmodeCB(fswtchGVmode[i], functions[i].adjustMode);
+ fswtchGVmode[i]->setModel(tabModelFactory->getItemModel(gvarAdjustModeId));
fswtchGVmode[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
connect(fswtchGVmode[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
paramLayout->addWidget(fswtchGVmode[i]);
fswtchParamGV[i] = new QCheckBox(this);
fswtchParamGV[i]->setProperty("index", i);
- fswtchParamGV[i]->setText("GV");
- fswtchParamGV[i]->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
+ fswtchParamGV[i]->setText(tr("GV"));
+ fswtchParamGV[i]->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
connect(fswtchParamGV[i], SIGNAL(stateChanged(int)), this, SLOT(customFunctionEdited()));
paramLayout->addWidget(fswtchParamGV[i]);
@@ -207,15 +182,6 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
connect(fswtchParamArmT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
- fswtchBLcolor[i] = new QSlider(this);
- fswtchBLcolor[i]->setProperty("index", i);
- fswtchBLcolor[i]->setMinimum(0);
- fswtchBLcolor[i]->setMaximum(100);
- fswtchBLcolor[i]->setSingleStep(1);
- fswtchBLcolor[i]->setOrientation(Qt::Horizontal);
- paramLayout->addWidget(fswtchBLcolor[i]);
- connect(fswtchBLcolor[i], SIGNAL(sliderReleased()), this, SLOT(customFunctionEdited()));
-
playBT[i] = new QToolButton(this);
playBT[i]->setProperty("index", i);
playBT[i]->setIcon(playIcon);
@@ -225,9 +191,13 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
QHBoxLayout * repeatLayout = new QHBoxLayout();
tableLayout->addLayout(i, 4, repeatLayout);
- fswtchRepeat[i] = new RepeatComboBox(this, functions[i].repeatParam);
+ fswtchRepeat[i] = new QComboBox(this);
+ fswtchRepeat[i]->setProperty("index", i);
+ fswtchRepeat[i]->setModel(tabModelFactory->getItemModel(repeatId));
+ fswtchRepeat[i]->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+ fswtchRepeat[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
repeatLayout->addWidget(fswtchRepeat[i], i + 1);
- connect(fswtchRepeat[i], SIGNAL(modified()), this, SLOT(onRepeatModified()));
+ connect(fswtchRepeat[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
fswtchEnable[i] = new QCheckBox(this);
fswtchEnable[i]->setProperty("index", i);
@@ -250,10 +220,8 @@ CustomFunctionsPanel::~CustomFunctionsPanel()
{
if (mediaPlayer)
stopSound(mediaPlayerCurrent);
- delete rawSwitchFilteredModel;
- delete rawSourceAllModel;
- delete rawSourceInputsModel;
- delete rawSourceGVarsModel;
+ delete tabModelFactory;
+ delete tabFilterFactory;
}
void CustomFunctionsPanel::onMediaPlayerStateChanged(QMediaPlayer::State state)
@@ -333,7 +301,6 @@ void CustomFunctionsPanel::toggleSound(bool play)
#define CUSTOM_FUNCTION_ENABLE (1<<6)
#define CUSTOM_FUNCTION_REPEAT (1<<7)
#define CUSTOM_FUNCTION_PLAY (1<<8)
-#define CUSTOM_FUNCTION_BL_COLOR (1<<9)
#define CUSTOM_FUNCTION_SHOW_FUNC (1<<10)
@@ -363,11 +330,6 @@ void CustomFunctionsPanel::functionEdited()
}
}
-void CustomFunctionsPanel::onRepeatModified()
-{
- emit modified();
-}
-
void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
{
CustomFunctionData & cfn = functions[i];
@@ -414,8 +376,8 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast) {
int gvidx = func - FuncAdjustGV1;
if (modified)
- cfn.adjustMode = fswtchGVmode[i]->currentIndex();
- fswtchGVmode[i]->setCurrentIndex(cfn.adjustMode);
+ cfn.adjustMode = fswtchGVmode[i]->currentData().toInt();
+ fswtchGVmode[i]->setCurrentIndex(fswtchGVmode[i]->findData(cfn.adjustMode));
widgetsMask |= CUSTOM_FUNCTION_GV_MODE | CUSTOM_FUNCTION_ENABLE;
if (cfn.adjustMode == FUNC_ADJUST_GVAR_CONSTANT || cfn.adjustMode == FUNC_ADJUST_GVAR_INCDEC) {
if (modified)
@@ -468,8 +430,10 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
}
else if (func == FuncPlaySound || func == FuncPlayHaptic || func == FuncPlayValue || func == FuncPlayPrompt || func == FuncPlayBoth || func == FuncBackgroundMusic) {
if (func != FuncBackgroundMusic) {
+ if (modified)
+ cfn.repeatParam = fswtchRepeat[i]->currentData().toInt();
widgetsMask |= CUSTOM_FUNCTION_REPEAT;
- fswtchRepeat[i]->update();
+ fswtchRepeat[i]->setCurrentIndex(fswtchRepeat[i]->findData(cfn.repeatParam));
}
if (func == FuncPlayValue) {
if (modified)
@@ -493,7 +457,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
if (modified) {
if (fswtchParamGV[i]->isChecked()) {
fswtchParam[i]->setMinimum(1);
- cfn.param = std::min(fswtchParam[i]->value(),5.0)+(fswtchParamGV[i]->isChecked() ? 250 : 0);
+ cfn.param = std::min(fswtchParam[i]->value(), 5.0) + (fswtchParamGV[i]->isChecked() ? 250 : 0);
}
else {
cfn.param = fswtchParam[i]->value();
@@ -577,7 +541,6 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
fswtchEnable[i]->setChecked(false);
fswtchRepeat[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_REPEAT);
fswtchGVmode[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_MODE);
- fswtchBLcolor[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_BL_COLOR);
playBT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_PLAY);
}
@@ -653,77 +616,43 @@ void CustomFunctionsPanel::onCustomContextMenuRequested(QPoint pos)
contextMenu.exec(globalPos);
}
-void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
-{
- b->clear();
- for (unsigned int i = 0; i < FuncCount; i++) {
- if (((i >= FuncOverrideCH1 && i <= FuncOverrideCH32) && (!model || !firmware->getCapability(SafetyChannelCustomFunction))) ||
- ((i == FuncVolume || i == FuncBackgroundMusic || i == FuncBackgroundMusicPause) && !firmware->getCapability(HasVolume)) ||
- ((i == FuncPlayScript && !IS_HORUS_OR_TARANIS(firmware->getBoard()))) ||
- ((i == FuncPlayHaptic) && !firmware->getCapability(Haptic)) ||
- ((i == FuncPlayBoth) && !firmware->getCapability(HasBeeper)) ||
- ((i == FuncLogs) && !firmware->getCapability(HasSDLogs)) ||
- ((i == FuncSetTimer3) && firmware->getCapability(Timers) < 3) ||
- ((i == FuncScreenshot) && !IS_HORUS_OR_TARANIS(firmware->getBoard())) ||
- ((i >= FuncRangeCheckInternalModule && i <= FuncBindExternalModule) && (!model || !firmware->getCapability(DangerousFunctions))) ||
- ((i >= FuncAdjustGV1 && i <= FuncAdjustGVLast) && (!model || !firmware->getCapability(Gvars)))
- ) {
- // skipped
- continue;
- }
- else {
- b->addItem(CustomFunctionData(AssignFunc(i)).funcToString(model), i);
- if (i == value) {
- b->setCurrentIndex(b->count() - 1);
- }
- }
- }
-}
-
-void CustomFunctionsPanel::populateGVmodeCB(QComboBox *b, unsigned int value)
-{
- b->clear();
- b->addItem(tr("Value"));
- b->addItem(tr("Source"));
- b->addItem(tr("GVAR"));
- b->addItem(tr("Increment"));
- b->setCurrentIndex(value);
-}
-
void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode)
{
QStringList qs;
b->setModel(new QStandardItemModel(b)); // clear combo box but not any shared item model
if (function == FuncPlaySound) {
- CustomFunctionData::populatePlaySoundParams(qs);
- b->addItems(qs);
- b->setCurrentIndex(value);
+ b->setModel(tabModelFactory->getItemModel(playSoundId));
+ b->setCurrentIndex(b->findData(value));
}
else if (function == FuncPlayHaptic) {
- CustomFunctionData::populateHapticParams(qs);
- b->addItems(qs);
- b->setCurrentIndex(value);
+ b->setModel(tabModelFactory->getItemModel(harpicId));
+ b->setCurrentIndex(b->findData(value));
}
else if (function == FuncReset) {
- CustomFunctionData::populateResetParams(model, b, value);
+ b->setModel(tabFilterFactory->getItemModel(funcResetParamId));
+ b->setCurrentIndex(b->findData(value));
}
else if (function == FuncVolume || function == FuncBacklight) {
- b->setModel(rawSourceInputsModel);
+ b->setModel(tabFilterFactory->getItemModel(rawSourceInputsId));
b->setCurrentIndex(b->findData(value));
}
else if (function == FuncPlayValue) {
- b->setModel(rawSourceAllModel);
+ b->setModel(tabFilterFactory->getItemModel(rawSourceAllId));
b->setCurrentIndex(b->findData(value));
}
else if (function >= FuncAdjustGV1 && function <= FuncAdjustGVLast) {
switch (adjustmode) {
case 1:
- b->setModel(rawSourceInputsModel);
+ b->setModel(tabFilterFactory->getItemModel(rawSourceInputsId));
b->setCurrentIndex(b->findData(value));
+ if (b->currentIndex() < 0)
+ b->setCurrentIndex(0);
break;
case 2:
- b->setModel(rawSourceGVarsModel);
+ b->setModel(tabFilterFactory->getItemModel(rawSourceGVarsId));
b->setCurrentIndex(b->findData(value));
+ if (b->currentIndex() < 0)
+ b->setCurrentIndex(0);
break;
}
}
@@ -828,7 +757,7 @@ bool CustomFunctionsPanel::moveUpAllowed() const
return selectedIndex > 0;
}
-void CustomFunctionsPanel::connectItemModelEvents(const FilteredItemModel * itemModel)
+void CustomFunctionsPanel::connectItemModelEvents(FilteredItemModel * itemModel)
{
connect(itemModel, &FilteredItemModel::aboutToBeUpdated, this, &CustomFunctionsPanel::onItemModelAboutToBeUpdated);
connect(itemModel, &FilteredItemModel::updateComplete, this, &CustomFunctionsPanel::onItemModelUpdateComplete);
diff --git a/companion/src/modeledit/customfunctions.h b/companion/src/modeledit/customfunctions.h
index e41baf672..87775246d 100644
--- a/companion/src/modeledit/customfunctions.h
+++ b/companion/src/modeledit/customfunctions.h
@@ -18,38 +18,19 @@
* GNU General Public License for more details.
*/
-#ifndef _CUSTOMFUNCTIONS_H_
-#define _CUSTOMFUNCTIONS_H_
+#pragma once
#include "modeledit.h"
#include "eeprominterface.h"
+#include "compounditemmodels.h"
+#include "filtereditemmodels.h"
#include
-class CompoundItemModelFactory;
-class FilteredItemModel;
class TimerEdit;
constexpr char MIMETYPE_CUSTOM_FUNCTION[] = "application/x-companion-custom-function";
-class RepeatComboBox: public QComboBox
-{
- Q_OBJECT
-
- public:
- RepeatComboBox(QWidget * parent, int & repeatParam);
- void update();
-
- signals:
- void modified();
-
- private slots:
- void onIndexChanged(int);
-
- protected:
- int & repeatParam;
-};
-
class CustomFunctionsPanel : public GenericPanel
{
Q_OBJECT
@@ -68,7 +49,6 @@ class CustomFunctionsPanel : public GenericPanel
void functionEdited();
void onCustomContextMenuRequested(QPoint pos);
void refreshCustomFunction(int index, bool modified=false);
- void onRepeatModified();
bool playSound(int index);
void stopSound(int index);
void toggleSound(bool play);
@@ -87,8 +67,6 @@ class CustomFunctionsPanel : public GenericPanel
void onItemModelUpdateComplete();
private:
- void populateFuncCB(QComboBox *b, unsigned int value);
- void populateGVmodeCB(QComboBox *b, unsigned int value);
void populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode=0);
bool hasClipboardData(QByteArray * data = nullptr) const;
bool insertAllowed() const;
@@ -96,12 +74,20 @@ class CustomFunctionsPanel : public GenericPanel
bool moveUpAllowed() const;
void swapData(int idx1, int idx2);
void resetCBsAndRefresh(int idx);
- void connectItemModelEvents(const FilteredItemModel * itemModel);
+ void connectItemModelEvents(FilteredItemModel * itemModel);
- FilteredItemModel * rawSwitchFilteredModel;
- FilteredItemModel * rawSourceAllModel;
- FilteredItemModel * rawSourceInputsModel;
- FilteredItemModel * rawSourceGVarsModel;
+ CompoundItemModelFactory * tabModelFactory;
+ FilteredItemModelFactory * tabFilterFactory;
+ int funcActionsId;
+ int funcResetParamId;
+ int rawSwitchId;
+ int rawSourceAllId;
+ int rawSourceInputsId;
+ int rawSourceGVarsId;
+ int playSoundId;
+ int harpicId;
+ int repeatId;
+ int gvarAdjustModeId;
QSet tracksSet;
QSet scriptsSet;
@@ -115,14 +101,11 @@ class CustomFunctionsPanel : public GenericPanel
QComboBox * fswtchParamT[CPN_MAX_SPECIAL_FUNCTIONS];
QComboBox * fswtchParamArmT[CPN_MAX_SPECIAL_FUNCTIONS];
QCheckBox * fswtchEnable[CPN_MAX_SPECIAL_FUNCTIONS];
- RepeatComboBox * fswtchRepeat[CPN_MAX_SPECIAL_FUNCTIONS];
+ QComboBox * fswtchRepeat[CPN_MAX_SPECIAL_FUNCTIONS];
QComboBox * fswtchGVmode[CPN_MAX_SPECIAL_FUNCTIONS];
- QSlider * fswtchBLcolor[CPN_MAX_SPECIAL_FUNCTIONS];
QMediaPlayer * mediaPlayer;
int selectedIndex;
int fswCapability;
int modelsUpdateCnt;
};
-
-#endif // _CUSTOMFUNCTIONS_H_