Skip to content

Commit

Permalink
changed to match common Griduino file
Browse files Browse the repository at this point in the history
  • Loading branch information
@barry-ha
barry-ha committed Jan 18, 2024
1 parent 4d0173c commit 68b8ab6
Show file tree
Hide file tree
Showing 8 changed files with 1,140 additions and 408 deletions.
130 changes: 66 additions & 64 deletions examples/Baroduino/TextField.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
// Please format this file with clang before check-in to GitHub
/*
* File: TextField.cpp
*/

#include <Arduino.h>
//#include "Adafruit_GFX.h" // Core graphics display library
#include "Adafruit_ILI9341.h" // TFT color display library
#include "constants.h" // Griduino constants, colors and typedefs
#include "TextField.h" // Optimize TFT display text for proportional fonts
#include "Adafruit_ILI9341.h" // TFT color display library
#include "constants.h" // Griduino constants, colors and typedefs
#include "TextField.h" // Optimize TFT display text for proportional fonts

// ========== extern ==================================
extern Adafruit_ILI9341 tft; // Griduino.ino TODO: eliminate this global
extern Adafruit_ILI9341 tft; // Griduino.ino TODO: eliminate this global
extern void setFontSize(int font); // Griduino.ino TODO: eliminate this extern

uint16_t TextField::cBackground; // background color

void setFontSize(int font); // forward definition
uint16_t TextField::cBackground; // background color

// ========== TextField ===============================
void TextField::eraseOld() {
// we remember the area to erase from the previous print()
tft.fillRect(xPrev, yPrev, wPrev, hPrev, cBackground); // erase the requested width of old text
//tft.drawRect(xPrev-2, yPrev-2, wPrev+4, hPrev+4, ILI9341_RED); // debug: show what area was erased
tft.fillRect(xPrev, yPrev, wPrev, hPrev, cBackground); // erase the requested width of old text
// tft.drawRect(xPrev-2, yPrev-2, wPrev+4, hPrev+4, ILI9341_RED); // debug: show what area was erased
}
void TextField::printNew(const char* pText) {
void TextField::printNew(const char *pText) {
int16_t x1, y1;
uint16_t w, h;

Expand All @@ -33,11 +33,10 @@ void TextField::printNew(const char* pText) {
if (align == ALIGNCENTER) {
// centered text left-right (ignore any given x-coordinate)
tft.getTextBounds(pText, 0, y, &x1, &y1, &w, &h);
leftedge = (tft.width() - w)/2;
}
else if (align == ALIGNRIGHT) {
leftedge = (tft.width() - w) / 2;
} else if (align == ALIGNRIGHT) {
tft.getTextBounds(pText, 0, y, &x1, &y1, &w, &h);
leftedge = x - w; // move text origin by width of text
leftedge = x - w; // move text origin by width of text
}
tft.setCursor(leftedge, y);
tft.setTextColor(color);
Expand All @@ -47,38 +46,39 @@ void TextField::printNew(const char* pText) {
tft.getTextBounds(pText, leftedge, y, &xPrev, &yPrev, &wPrev, &hPrev);
}

void TextButton::print() { // override base class: buttons draw their own outline
tft.fillRoundRect(buttonArea.ul.x, buttonArea.ul.y,
buttonArea.size.x, buttonArea.size.y,
void TextButton::print() { // override base class: buttons draw their own outline
tft.fillRoundRect(buttonArea.ul.x, buttonArea.ul.y,
buttonArea.size.x, buttonArea.size.y,
radius, cBUTTONFILL);
tft.drawRoundRect(buttonArea.ul.x, buttonArea.ul.y,
buttonArea.size.x, buttonArea.size.y,
tft.drawRoundRect(buttonArea.ul.x, buttonArea.ul.y,
buttonArea.size.x, buttonArea.size.y,
radius, cBUTTONOUTLINE);

// center text horizontally and vertically withing visible button boundary
int16_t x1, y1;
uint16_t w1, h1;
tft.getTextBounds(text, buttonArea.ul.x, buttonArea.ul.y, &x1, &y1, &w1, &h1);

int leftEdge = buttonArea.ul.x + buttonArea.size.x/2 - 1/2;
int topEdge = buttonArea.ul.y + buttonArea.size.y/2;
int leftEdge = buttonArea.ul.x + buttonArea.size.x / 2 - 1 / 2;
int topEdge = buttonArea.ul.y + buttonArea.size.y / 2;

x = leftEdge;
y = topEdge;

Serial.print("Placement of text: "); Serial.println(text);
Serial.print("Placement of text: ");
Serial.println(text);
char temp[255];
snprintf(temp, sizeof(temp),
". button outline (%d,%d,%d,%d), text posn(%d,%d)",
buttonArea.ul.x, buttonArea.ul.y, buttonArea.size.x, buttonArea.size.y, leftEdge, topEdge);
snprintf(temp, sizeof(temp),
". button outline (%d,%d,%d,%d), text posn(%d,%d)",
buttonArea.ul.x, buttonArea.ul.y, buttonArea.size.x, buttonArea.size.y, leftEdge, topEdge);
Serial.println(temp); // debug

#ifdef SHOW_TOUCH_TARGETS
tft.drawRect(hitTarget.ul.x, hitTarget.ul.y, // debug: draw outline around hit target
hitTarget.size.x, hitTarget.size.y,
cTOUCHTARGET);
#endif
#ifdef SHOW_TOUCH_TARGETS
tft.drawRect(hitTarget.ul.x, hitTarget.ul.y, // debug: draw outline around hit target
hitTarget.size.x, hitTarget.size.y,
cTOUCHTARGET);
#endif

// base class will draw text
TextField::print(text);
}
Expand All @@ -97,51 +97,53 @@ void TextButton::print() { // override base class: buttons draw their
void setFontSize(int font) {
// input: "font" = point size
switch (font) {
case 36: // eFONTGIANT
tft.setFont(&FreeSans18pt7b);
tft.setTextSize(2);
break;

case 24: // eFONTBIG
tft.setFont(&FreeSansBold24pt7b);
tft.setTextSize(1);
break;

case 12: // eFONTSMALL
tft.setFont(&FreeSans12pt7b);
tft.setTextSize(1);
break;

case 9: // eFONTSMALLEST
tft.setFont(&FreeSans9pt7b);
tft.setTextSize(1);
break;

case 0: // eFONTSYSTEM
tft.setFont();
tft.setTextSize(2);
break;

default:
Serial.print("Error, unknown font size ("); Serial.print(font); Serial.println(")");
break;
case 36: // eFONTGIANT
tft.setFont(&FreeSans18pt7b);
tft.setTextSize(2);
break;

case 24: // eFONTBIG
tft.setFont(&FreeSansBold24pt7b);
tft.setTextSize(1);
break;

case 12: // eFONTSMALL
tft.setFont(&FreeSans12pt7b);
tft.setTextSize(1);
break;

case 9: // eFONTSMALLEST
tft.setFont(&FreeSans9pt7b);
tft.setTextSize(1);
break;

case 0: // eFONTSYSTEM
tft.setFont();
tft.setTextSize(2);
break;

default:
Serial.print("Error, unknown font size (");
Serial.print(font);
Serial.println(")");
break;
}
}

int getOffsetToCenterText(String text) {
// measure width of given text in current font and
// measure width of given text in current font and
// calculate X-offset to make it centered left-right on screen
int16_t x1, y1;
uint16_t w, h;
tft.getTextBounds(text, 0, 0, &x1, &y1, &w, &h); // compute "pixels wide"
tft.getTextBounds(text, 0, 0, &x1, &y1, &w, &h); // compute "pixels wide"
return (gScreenWidth - w) / 2;
}

int getOffsetToCenterTextOnButton(String text, int leftEdge, int width ) {
// measure width of given text in current font and
int getOffsetToCenterTextOnButton(String text, int leftEdge, int width) {
// measure width of given text in current font and
// calculate X-offset to make it centered left-right within given bounds
int16_t x1, y1;
uint16_t w, h;
tft.getTextBounds(text, 0, 0, &x1, &y1, &w, &h); // compute "pixels wide"
tft.getTextBounds(text, 0, 0, &x1, &y1, &w, &h); // compute "pixels wide"
return leftEdge + (width - w) / 2;
}
Loading

0 comments on commit 68b8ab6

Please sign in to comment.