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

Colorlcd: New curves default to "y=x"

Browse Source
This commit is contained in:
Raphael Coeffic
2021-05-27 07:03:24 +02:00
parent f58317f74e
commit dee7a3ea6b
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_curves.cpp
+35 -22
View File
@@ -271,9 +271,30 @@ void ModelCurvesPage::build(FormWindow * window, int8_t focusIndex)
grid.setLabelWidth(66); grid.setLabelWidth(66);
for (uint8_t index = 0; index < MAX_CURVES; index++) { for (uint8_t index = 0; index < MAX_CURVES; index++) {
CurveHeader &curve = g_model.curves[index]; CurveHeader &curve = g_model.curves[index];
int8_t * points = curveAddress(index); int8_t * points = curveAddress(index);
std::function<void(void)> presetCurveFct = [=]() {
Menu *menu = new Menu(window);
for (int angle = -45; angle <= 45; angle += 15) {
char label[16];
strAppend(strAppendSigned(label, angle), "@");
menu->addLine(label, [=]() {
int dx = 2000 / (5 + curve.points - 1);
for (uint8_t i = 0; i < 5 + curve.points; i++) {
int x = -1000 + i * dx;
points[i] = divRoundClosest(angle * x, 450);
}
if (curve.type == CURVE_TYPE_CUSTOM) {
resetCustomCurveX(points, 5 + curve.points);
}
storageDirty(EE_MODEL);
rebuild(window, index);
});
}
};
if (isCurveUsed(index)) { if (isCurveUsed(index)) {
// Curve label // Curve label
new StaticText(window, grid.getLabelSlot(), getCurveString(1 + index), BUTTON_BACKGROUND, CENTERED); new StaticText(window, grid.getLabelSlot(), getCurveString(1 + index), BUTTON_BACKGROUND, CENTERED);
@@ -285,25 +306,7 @@ void ModelCurvesPage::build(FormWindow * window, int8_t focusIndex)
menu->addLine(STR_EDIT, [=]() { menu->addLine(STR_EDIT, [=]() {
editCurve(window, index); editCurve(window, index);
}); });
menu->addLine(STR_CURVE_PRESET, [=]() { menu->addLine(STR_CURVE_PRESET, presetCurveFct);
Menu * menu = new Menu(window);
for (int angle = -45; angle <= 45; angle += 15) {
char label[16];
strAppend(strAppendSigned(label, angle), "@");
menu->addLine(label, [=]() {
int dx = 2000 / (5 + curve.points - 1);
for (uint8_t i = 0; i < 5 + curve.points; i++) {
int x = -1000 + i * dx;
points[i] = divRoundClosest(angle * x, 450);
}
if (curve.type == CURVE_TYPE_CUSTOM) {
resetCustomCurveX(points, 5 + curve.points);
}
storageDirty(EE_MODEL);
rebuild(window, index);
});
}
});
menu->addLine(STR_MIRROR, [=]() { menu->addLine(STR_MIRROR, [=]() {
curveMirror(index); curveMirror(index);
storageDirty(EE_MODEL); storageDirty(EE_MODEL);
@@ -324,10 +327,20 @@ void ModelCurvesPage::build(FormWindow * window, int8_t focusIndex)
grid.spacer(button->height() + 5); grid.spacer(button->height() + 5);
} }
else { else {
auto button = new TextButton(window, grid.getLabelSlot(), getCurveString(1 + index)); auto button = new TextButton(window, grid.getLabelSlot(),
getCurveString(1 + index));
button->setPressHandler([=]() { button->setPressHandler([=]() {
editCurve(window, index); Menu *menu = new Menu(window);
return 0; menu->addLine(STR_EDIT, [=]() {
int dx = 2000 / (5 + curve.points - 1);
for (uint8_t i = 0; i < 5 + curve.points; i++) {
int x = -1000 + i * dx;
points[i] = x / 10;
}
editCurve(window, index);
});
menu->addLine(STR_CURVE_PRESET, presetCurveFct);
return 0;
}); });
grid.spacer(button->height() + 5); grid.spacer(button->height() + 5);
} }