thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-09-11 19:55:14 +02:00
Code Releases Activity

Fix some more issues on printBoatValue() function

Browse Source
This commit is contained in:
Ulrich Meine
2026-08-31 16:34:33 +02:00
parent 93084c980a
commit 9eb0983ee4
1 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/obp60task/OBP60Extensions.cpp
+35 -50
View File
@@ -660,64 +660,49 @@ static void printBoatValueImpl(const String &sBoatValue, const int16_t x, const
decimalPart = sBoatValue.substring(dot + 1); decimalPart = sBoatValue.substring(dot + 1);
} }
// ----------------------------------------------------------------- // Measure integer part
// Small decimals mode int16_t ix1, iy1;
// ----------------------------------------------------------------- uint16_t iw, ih;
if (smallDecs) { display.setFont(mainFont);
// Measure integer part displayGetTextBounds(integerPart, 0, 0, &ix1, &iy1, &iw, &ih, dsegAdjust);
int16_t ix1, iy1; intW = ix1 + iw;
uint16_t iw, ih;
display.setFont(mainFont);
displayGetTextBounds(integerPart, 0, 0, &ix1, &iy1, &iw, &ih, dsegAdjust);
intW = ix1 + iw;
// Measure decimal part // Measure decimal part only if one actually exists
decW = 0;
if (dot != -1 && decimalPart.length() > 0) {
int16_t dx1, dy1; int16_t dx1, dy1;
uint16_t dw, dh; uint16_t dw, dh;
display.setFont(decimalFont); display.setFont(smallDecs ? decimalFont : mainFont);
displayGetTextBounds(decimalPart, 0, 0, &dx1, &dy1, &dw, &dh, dsegAdjust); displayGetTextBounds(decimalPart, 0, 0, &dx1, &dy1, &dw, &dh, dsegAdjust);
decW = dx1 + dw; decW = dx1 + dw;
const int16_t totalWidth = intW + decW;
int16_t startX;
switch (align) {
case 0: // LEFT
startX = x;
break;
case 1: // CENTER
startX = x - totalWidth / 2;
break;
case 2: // RIGHT
default:
startX = x - totalWidth;
break;
}
decimalLeftX = startX + intW;
// Draw integer part
display.setFont(mainFont);
getdisplay().setCursor(startX, y);
getdisplay().print(integerPart);
// Draw decimal part immediately after integer part
display.setFont(decimalFont);
getdisplay().setCursor(decimalLeftX, y);
getdisplay().print(decimalPart);
return;
} }
// ----------------------------------------------------------------- const int16_t totalWidth = intW + decW;
// Normal rendering (no small decimals) int16_t startX;
// ----------------------------------------------------------------- switch (align) {
case 0: // LEFT
startX = x;
break;
case 1: // CENTER
startX = x - totalWidth / 2;
break;
case 2: // RIGHT
default:
startX = x - totalWidth;
break;
}
decimalLeftX = startX + intW;
// Draw integer part
display.setFont(mainFont); display.setFont(mainFont);
if (align == 2) { getdisplay().setCursor(startX, y);
drawTextRalign(x, y, sBoatValue, dsegAdjust); getdisplay().print(integerPart);
} else if (align == 1) {
drawTextCenter(x, y, sBoatValue, dsegAdjust); // Draw decimal part only when present
} else { if (dot != -1 && decimalPart.length() > 0) {
getdisplay().setCursor(x, y); display.setFont(smallDecs ? decimalFont : mainFont);
getdisplay().print(sBoatValue); getdisplay().setCursor(decimalLeftX, y);
getdisplay().print(decimalPart);
} }
} }