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

[Horus] Better fix for #4222 - at least I hope so

Browse Source
This commit is contained in:
Bertrand Songis
2017-01-29 10:23:26 +01:00
parent 8eadee0719
commit 3e00d016b2
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/model_curves.cpp
+10 -13
View File
@@ -18,7 +18,6 @@
* GNU General Public License for more details.
*/
#include <stdio.h>
#include "opentx.h"
void drawCurve(int x, int y, int width)
@@ -69,7 +68,7 @@ void onCurveOneMenu(const char * result)
}
}
#define MODEL_CURVE_ONE_2ND_COLUMN 130
#define MODEL_CURVE_ONE_2ND_COLUMN 130
enum MenuModelCurveOneItems {
ITEM_CURVE_NAME,
@@ -80,24 +79,20 @@ enum MenuModelCurveOneItems {
ITEM_CURVE_COORDS2,
};
#define IS_COORDS1_LINE_NEEDED() (crv.type==CURVE_TYPE_CUSTOM && crv.points > -3)
bool menuModelCurveOne(event_t event)
{
static uint8_t pointsOfs = 0;
CurveData & crv = g_model.curves[s_curveChan];
int8_t * points = curveAddress(s_curveChan);
SUBMENU_WITH_OPTIONS(STR_MENUCURVE, ICON_MODEL_CURVES, crv.type==CURVE_TYPE_CUSTOM ? 6 : 5, OPTION_MENU_NO_FOOTER, { 0, 0, 0, 0, uint8_t(5+crv.points-1), uint8_t(5+crv.points-1) });
SUBMENU_WITH_OPTIONS(STR_MENUCURVE, ICON_MODEL_CURVES, IS_COORDS1_LINE_NEEDED() ? 6 : 5, OPTION_MENU_NO_FOOTER, { 0, 0, 0, 0, uint8_t(5+crv.points-1), uint8_t(5+crv.points-1) });
drawStringWithIndex(50, 3+FH, STR_CV, s_curveChan+1, MENU_TITLE_COLOR);
lcdDrawSolidFilledRect(0, MENU_FOOTER_TOP, 250, MENU_FOOTER_HEIGHT, HEADER_BGCOLOR);
if (crv.type==CURVE_TYPE_CUSTOM && menuVerticalPosition == ITEM_CURVE_COORDS1) {
if (crv.points <= -3) { // can't edit X values on custom curves with 2 points.
if (CURSOR_MOVED_RIGHT(event))
(menuHorizontalPosition = 0, menuVerticalPosition += 1);
else
menuVerticalPosition -= 1;
}
else if (menuHorizontalPosition == 0) {
if (IS_COORDS1_LINE_NEEDED() && menuVerticalPosition == ITEM_CURVE_COORDS1) {
if (menuHorizontalPosition == 0) {
if (CURSOR_MOVED_RIGHT(event))
menuHorizontalPosition = 1;
else
@@ -190,13 +185,15 @@ bool menuModelCurveOne(event_t event)
uint8_t selectionMode = 0;
if (menuHorizontalPosition == i) {
if (menuVerticalPosition == ITEM_CURVE_COORDS1)
selectionMode = (crv.type==CURVE_TYPE_CUSTOM ? 1 : 2);
selectionMode = (IS_COORDS1_LINE_NEEDED() ? 1 : 2);
else if (menuVerticalPosition == ITEM_CURVE_COORDS2)
selectionMode = 2;
}
int8_t x = -100 + 200*i/(5+crv.points-1);
if (crv.type==CURVE_TYPE_CUSTOM && i>0 && i<5+crv.points-1) x = points[5+crv.points+i-1];
if (crv.type==CURVE_TYPE_CUSTOM && i>0 && i<5+crv.points-1) {
x = points[5+crv.points+i-1];
}
if (i>=pointsOfs && i<pointsOfs+5) {
lcdDrawNumber(posX, MENU_CONTENT_TOP + 5*FH-12, i+1, TEXT_DISABLE_COLOR|RIGHT);