Cosmetics

This commit is contained in:
Bertrand Songis
2019-10-14 13:40:32 +02:00
parent 7bad66db1c
commit 82b519d1e2
4 changed files with 25 additions and 25 deletions
@@ -79,7 +79,7 @@ class SimulatorInterface : public QObject
CAP_ENUM_COUNT CAP_ENUM_COUNT
}; };
// This allows automatic en/decoding of flight mode + gvar value to/from any int32 // This allows automatic en/decoding of flight mode + gvarIdx value to/from any int32
struct gVarMode_t { struct gVarMode_t {
int16_t value; int16_t value;
uint8_t mode; uint8_t mode;
+7 -6
View File
@@ -492,7 +492,7 @@ void drawSourceCustomValue(BitmapBuffer * dc, coord_t x, coord_t y, source_t sou
dc->drawNumber(x, y, value, flags|PREC1); dc->drawNumber(x, y, value, flags|PREC1);
} }
#if defined(INTERNAL_GPS) #if defined(INTERNAL_GPS)
else if (source == MIXSRC_TX_GPS) { else if (source == MIXSRC_TX_GPS) {
if (gpsData.fix) { if (gpsData.fix) {
drawGPSPosition(x, y, gpsData.longitude, gpsData.latitude, flags); drawGPSPosition(x, y, gpsData.longitude, gpsData.latitude, flags);
} }
@@ -503,7 +503,7 @@ void drawSourceCustomValue(BitmapBuffer * dc, coord_t x, coord_t y, source_t sou
} }
#endif #endif
#if defined(GVARS) #if defined(GVARS)
else if (source >= MIXSRC_FIRST_GVAR && source <= MIXSRC_LAST_GVAR) { else if (source >= MIXSRC_FIRST_GVAR && source <= MIXSRC_LAST_GVAR) {
drawGVarValue(dc, x, y, source - MIXSRC_FIRST_GVAR, value, flags); drawGVarValue(dc, x, y, source - MIXSRC_FIRST_GVAR, value, flags);
} }
#endif #endif
@@ -524,10 +524,11 @@ void drawSourceCustomValue(BitmapBuffer * dc, coord_t x, coord_t y, source_t sou
void drawValueWithUnit(BitmapBuffer * dc, coord_t x, coord_t y, int val, uint8_t unit, LcdFlags flags) void drawValueWithUnit(BitmapBuffer * dc, coord_t x, coord_t y, int val, uint8_t unit, LcdFlags flags)
{ {
// convertUnit(val, unit); if ((flags & NO_UNIT) || unit == UNIT_RAW) {
dc->drawNumber(x, y, val, flags & (~NO_UNIT)); dc->drawNumber(x, y, val, flags & (~NO_UNIT));
if (!(flags & NO_UNIT) && unit != UNIT_RAW) { }
dc->drawTextAtIndex(lcdNextPos/*+1*/, y, STR_VTELEMUNIT, unit, 0); else {
dc->drawNumber(x, y, val, flags & (~NO_UNIT), 0, nullptr, TEXT_AT_INDEX(STR_VTELEMUNIT, unit).c_str());
} }
} }
+16 -17
View File
@@ -29,7 +29,7 @@
GVarButton::GVarButton(Window * parent, const rect_t &rect, uint8_t gvar) : GVarButton::GVarButton(Window * parent, const rect_t &rect, uint8_t gvar) :
Button(parent, rect), Button(parent, rect),
gvar(gvar) gvarIdx(gvar)
{ {
int perRow = (width() - GVAR_NAME_SIZE + TEXT_LEFT_MARGIN * 2) / GVAR_NAME_SIZE; int perRow = (width() - GVAR_NAME_SIZE + TEXT_LEFT_MARGIN * 2) / GVAR_NAME_SIZE;
lines = MAX_FLIGHT_MODES / perRow; lines = MAX_FLIGHT_MODES / perRow;
@@ -47,7 +47,7 @@ void GVarButton::checkEvents()
int32_t sum = 0; int32_t sum = 0;
for (int flightMode = 0; flightMode < MAX_FLIGHT_MODES; flightMode++) { for (int flightMode = 0; flightMode < MAX_FLIGHT_MODES; flightMode++) {
FlightModeData * fmData = &g_model.flightModeData[flightMode]; FlightModeData * fmData = &g_model.flightModeData[flightMode];
sum += fmData->gvars[gvar]; sum += fmData->gvars[gvarIdx];
} }
if (sum != gvarSum) invalidate(); if (sum != gvarSum) invalidate();
} }
@@ -55,31 +55,31 @@ void GVarButton::checkEvents()
void GVarButton::paint(BitmapBuffer * dc) void GVarButton::paint(BitmapBuffer * dc)
{ {
GVarData * gvariable = &g_model.gvars[gvar]; GVarData * gvar = &g_model.gvars[gvarIdx];
// The bounding rect // The bounding rect
int nameRectW = TEXT_LEFT_MARGIN + GVAR_NAME_SIZE; int nameRectW = TEXT_LEFT_MARGIN + GVAR_NAME_SIZE;
coord_t x = TEXT_LEFT_MARGIN; coord_t x = TEXT_LEFT_MARGIN;
coord_t y = FIELD_PADDING_TOP; coord_t y = FIELD_PADDING_TOP;
y += PAGE_LINE_HEIGHT;
currentFlightMode = getFlightMode(); currentFlightMode = getFlightMode();
gvarSum = 0; gvarSum = 0;
dc->drawSolidFilledRect(0, 0, nameRectW, rect.h, CURVE_AXIS_COLOR); dc->drawSolidFilledRect(0, 0, nameRectW, rect.h, CURVE_AXIS_COLOR);
dc->drawText(2, FIELD_PADDING_TOP, getGVarString(gvar), 0); dc->drawText(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getGVarString(gvarIdx), 0);
dc->drawSizedText(x, y, gvariable->name, LEN_GVAR_NAME, 0); dc->drawSizedText(x, y, gvar->name, LEN_GVAR_NAME, 0);
//values are right aligned
// values are right aligned
x += GVAR_NAME_SIZE; x += GVAR_NAME_SIZE;
bool bgFilled = false; bool bgFilled = false;
coord_t startX = x; coord_t startX = x;
int line = 0;
for (int flightMode = 0; flightMode < MAX_FLIGHT_MODES; flightMode++) { for (int flightMode = 0; flightMode < MAX_FLIGHT_MODES; flightMode++) {
FlightModeData * fmData = &g_model.flightModeData[flightMode]; FlightModeData * fmData = &g_model.flightModeData[flightMode];
gvar_t v = fmData->gvars[gvar]; gvar_t v = fmData->gvars[gvarIdx];
gvarSum += v; gvarSum += v;
LcdFlags attr = RIGHT; LcdFlags attr = RIGHT;
if (flightMode == currentFlightMode) attr |= BOLD; if (flightMode == currentFlightMode)
attr |= BOLD;
x += GVAR_NAME_SIZE; x += GVAR_NAME_SIZE;
if (x > width()) { if (x > width()) {
@@ -87,10 +87,8 @@ void GVarButton::paint(BitmapBuffer * dc)
x = nameRectW + GVAR_NAME_SIZE; x = nameRectW + GVAR_NAME_SIZE;
y += PAGE_LINE_HEIGHT * 2; y += PAGE_LINE_HEIGHT * 2;
startX = nameRectW; startX = nameRectW;
line += 2;
} }
y = FIELD_PADDING_TOP + line * PAGE_LINE_HEIGHT;
if (!bgFilled) { if (!bgFilled) {
dc->drawSolidFilledRect(startX, y, width() - startX, PAGE_LINE_HEIGHT, CURVE_AXIS_COLOR); dc->drawSolidFilledRect(startX, y, width() - startX, PAGE_LINE_HEIGHT, CURVE_AXIS_COLOR);
bgFilled = true; bgFilled = true;
@@ -99,20 +97,21 @@ void GVarButton::paint(BitmapBuffer * dc)
// Flight mode // Flight mode
drawFlightMode(dc, x, y, flightMode, attr); drawFlightMode(dc, x, y, flightMode, attr);
coord_t yval = FIELD_PADDING_TOP + (line + 1) * PAGE_LINE_HEIGHT; coord_t yval = y + PAGE_LINE_HEIGHT;
if (v <= GVAR_MAX && (gvar->prec > 0 || abs(v) >= 1000 || (abs(v) >= 100 && gvar->unit > 0))) {
if (v <= GVAR_MAX && (gvariable->prec > 0 || abs(v) >= 1000 || (abs(v) >= 100 && gvariable->unit > 0))) {
attr |= SMLSIZE; attr |= SMLSIZE;
attr &= ~BOLD;
yval += 3; yval += 3;
} }
if (v > GVAR_MAX) { if (v > GVAR_MAX) {
uint8_t fm = v - GVAR_MAX - 1; uint8_t fm = v - GVAR_MAX - 1;
if (fm >= flightMode) fm++; if (fm >= flightMode)
fm++;
drawFlightMode(dc, x, yval, fm, attr); drawFlightMode(dc, x, yval, fm, attr);
} }
else { else {
drawGVarValue(dc, x, yval, gvar, v, attr); drawGVarValue(dc, x, yval, gvarIdx, v, attr);
} }
} }
+1 -1
View File
@@ -33,7 +33,7 @@ class GVarButton : public Button {
protected: protected:
void drawFlightMode(BitmapBuffer * dc, coord_t x, coord_t y, int fm, LcdFlags attr); void drawFlightMode(BitmapBuffer * dc, coord_t x, coord_t y, int fm, LcdFlags attr);
uint8_t gvar; uint8_t gvarIdx;
int lines; int lines;
int32_t gvarSum; //used for invalidation int32_t gvarSum; //used for invalidation
uint8_t currentFlightMode; //used for invalidation uint8_t currentFlightMode; //used for invalidation