piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: allow an 'input' as the source for weight, offset and curve in input line (#5418)

Browse Source
This commit is contained in:
philmoz
2024-08-14 20:19:50 +10:00
committed by GitHub
parent 4c30b09c08
commit 102471751f
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/expodialog.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
setWindowTitle(tr("Edit %1").arg(RawSource(srcType, ed->chn).toString(&model, &generalSettings)));
int imId = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
(RawSource::AllSourceGroups & ~RawSource::NoneGroup & ~RawSource::ScriptsGroup & ~RawSource::InputsGroup)),
(RawSource::AllSourceGroups & ~RawSource::NoneGroup & ~RawSource::ScriptsGroup)),
"EditorSource");
FilteredItemModel *esMdl = dialogFilteredItemModels->getItemModel(imId);
radio/src/gui/128x64/model_input_edit.cpp
+3 -3
View File
@@ -117,12 +117,12 @@ void menuModelExpoOne(event_t event)
case EXPO_FIELD_WEIGHT:
ed->weight = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_WEIGHT, ed->weight,
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST, INPUTSRC_LAST);
-100, 100, attr, event, isSourceAvailable, MIXSRC_FIRST, INPUTSRC_LAST);
break;
case EXPO_FIELD_OFFSET:
ed->offset = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_OFFSET, ed->offset,
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST, INPUTSRC_LAST);
-100, 100, attr, event, isSourceAvailable, MIXSRC_FIRST, INPUTSRC_LAST);
break;
case EXPO_FIELD_CURVE_LABEL:
@@ -130,7 +130,7 @@ void menuModelExpoOne(event_t event)
break;
case EXPO_FIELD_CURVE:
editCurveRef(FW + 1, y, ed->curve, event, attr, isSourceAvailableInInputs, INPUTSRC_FIRST, INPUTSRC_LAST);
editCurveRef(FW + 1, y, ed->curve, event, attr, isSourceAvailable, MIXSRC_FIRST, INPUTSRC_LAST);
break;
#if defined(FLIGHT_MODES)
radio/src/gui/212x64/model_input_edit.cpp
+3 -3
View File
@@ -120,17 +120,17 @@ void menuModelExpoOne(event_t event)
case EXPO_FIELD_WEIGHT:
ed->weight = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_WEIGHT, ed->weight,
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST, INPUTSRC_LAST);
-100, 100, attr, event, isSourceAvailable, MIXSRC_FIRST, INPUTSRC_LAST);
break;
case EXPO_FIELD_OFFSET:
ed->offset = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_OFFSET, ed->offset,
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST, INPUTSRC_LAST);
-100, 100, attr, event, isSourceAvailable, MIXSRC_FIRST, INPUTSRC_LAST);
break;
case EXPO_FIELD_CURVE:
lcdDrawTextAlignedLeft(y, STR_CURVE);
editCurveRef(EXPO_ONE_2ND_COLUMN, y, ed->curve, event, attr, isSourceAvailableInInputs, INPUTSRC_FIRST, INPUTSRC_LAST);
editCurveRef(EXPO_ONE_2ND_COLUMN, y, ed->curve, event, attr, isSourceAvailable, MIXSRC_FIRST, INPUTSRC_LAST);
break;
#if defined(FLIGHT_MODES)
radio/src/gui/colorlcd/model/input_edit.cpp
+3 -3
View File
@@ -112,7 +112,7 @@ void InputEditWindow::buildBody(Window* form)
input->weight = newValue;
preview->update();
SET_DIRTY();
}, INPUTSRC_FIRST);
}, MIXSRC_FIRST);
gvar->setSuffix("%");
// Offset
@@ -123,7 +123,7 @@ void InputEditWindow::buildBody(Window* form)
input->offset = newValue;
preview->update();
SET_DIRTY();
}, INPUTSRC_FIRST);
}, MIXSRC_FIRST);
gvar->setSuffix("%");
// Switch
@@ -142,7 +142,7 @@ void InputEditWindow::buildBody(Window* form)
if (preview)
preview->update();
SET_DIRTY();
}, INPUTSRC_FIRST,
}, MIXSRC_FIRST,
[=]() {
if (preview)
preview->update();
radio/src/gui/colorlcd/model/mixer_edit.cpp
+3 -3
View File
@@ -110,13 +110,13 @@ void MixEditWindow::buildBody(Window *form)
line = form->newLine(grid);
new StaticText(line, rect_t{}, STR_WEIGHT);
auto svar = new SourceNumberEdit(line, MIX_WEIGHT_MIN, MIX_WEIGHT_MAX,
GET_SET_DEFAULT(mix->weight), 0);
GET_SET_DEFAULT(mix->weight), MIXSRC_FIRST);
svar->setSuffix("%");
// Offset
new StaticText(line, rect_t{}, STR_OFFSET);
auto gvar = new SourceNumberEdit(line, MIX_OFFSET_MIN, MIX_OFFSET_MAX,
GET_SET_DEFAULT(mix->offset), 0);
GET_SET_DEFAULT(mix->offset), MIXSRC_FIRST);
gvar->setSuffix("%");
// Switch
@@ -127,7 +127,7 @@ void MixEditWindow::buildBody(Window *form)
// Curve
new StaticText(line, rect_t{}, STR_CURVE);
new CurveParam(line, rect_t{}, &mix->curve, SET_DEFAULT(mix->curve.value), 0);
new CurveParam(line, rect_t{}, &mix->curve, SET_DEFAULT(mix->curve.value), MIXSRC_FIRST);
line = form->newLine(grid);
line->padAll(PAD_LARGE);