Allow the fixed fonts to be scaled up. #45

KurtE · 2024-08-12T00:02:26Z

This hopefully addresses issue #3

On larger displays, the two built in fonts are almost invisible. One possible solution is to supply some larger fonts.

Another approach is to do, like several TFT display drivers do and allow you to scale the system fixed fonts up to a larger size. Decided this was the easiest approach, and did a quick implementation of it. Like the Adafruit displays, I allowed you to set different scale factors for X and Y.

I added a scaledBitmap function which is a modified version of the current bitmap function. I also changed all of the text functions to use it. I left the unscalled version of the API, although I have it simply call the scaled version with scales 1 and 1, as since these methods are virtual, potentially some other subclasses might use and/or implement their own version.

Updated the textFontWidth and textFontHeight to multiply the height * the scale as the one example sketch here needs it.

I also updated the sketch to scale the canvas to take the font size into account. This appears to work with the changes and

I have not used or tested the scroll code. Its sizing should be updated teh same way the test sketch was with the changes with the textFontWidth and textFontHeight changes

github-actions · 2024-08-12T00:13:03Z

Memory usage change @ 6d1e09e

Board	flash	%	RAM for global variables	%
`arduino:samd:arduino_zero_edbg`	🔺 +364 - +364	+0.14 - +0.14	🔺 +3728 - +3728	+11.38 - +11.38
`arduino:samd:mkrzero`	🔺 +364 - +364	+0.14 - +0.14	🔺 +3728 - +3728	+11.38 - +11.38
`arduino:samd:nano_33_iot`	🔺 +364 - +364	+0.14 - +0.14	🔺 +3728 - +3728	+11.38 - +11.38

Click for full report table

Board	`examples/ASCIIDraw` flash	%	`examples/ASCIIDraw` RAM for global variables	%
`arduino:samd:arduino_zero_edbg`	364	0.14	3728	11.38
`arduino:samd:mkrzero`	364	0.14	3728	11.38
`arduino:samd:nano_33_iot`	364	0.14	3728	11.38

Click for full report CSV

Board,examples/ASCIIDraw<br>flash,%,examples/ASCIIDraw<br>RAM for global variables,%
arduino:samd:arduino_zero_edbg,364,0.14,3728,11.38
arduino:samd:mkrzero,364,0.14,3728,11.38
arduino:samd:nano_33_iot,364,0.14,3728,11.38

KurtE · 2024-08-12T18:50:02Z

As I mentioned in the forum thread:
https://forum.arduino.cc/t/arduino-h7-video-h-and-arduinographics-library-fonts/1289636/3?u=kurte

I have run what tests I know of for this library. I believe there are integration issues between this library and
the Arduino_H7_Video library, but that is caused by these changes. So I will go ahead and mark it ready for review

leonardocavagnis

The changes look good!

Some adjustments for consistency:

_textsize_x, _textsize_y -> _textSizeX, _textSizeY
setTextSize() -> textSize()
remove scaledBitmap function, and overload bitmap with default values

leonardocavagnis · 2024-09-02T10:12:24Z

src/ArduinoGraphics.h

@@ -114,6 +118,8 @@ class ArduinoGraphics : public Print {
  uint8_t _textR, _textG, _textB;
  int _textX;
  int _textY;
+  uint8_t _textsize_x;


Suggested change

uint8_t _textsize_x;

uint8_t _textSizeX;

leonardocavagnis · 2024-09-02T10:12:39Z

src/ArduinoGraphics.h

@@ -114,6 +118,8 @@ class ArduinoGraphics : public Print {
  uint8_t _textR, _textG, _textB;
  int _textX;
  int _textY;
+  uint8_t _textsize_x;
+  uint8_t _textsize_y;


Suggested change

uint8_t _textsize_y;

uint8_t _textSizeY;

leonardocavagnis · 2024-09-02T10:13:59Z

src/ArduinoGraphics.h

@@ -92,6 +94,8 @@ class ArduinoGraphics : public Print {

 protected:
  virtual void bitmap(const uint8_t* data, int x, int y, int width, int height);
+  virtual void scaledBitmap(const uint8_t* data, int x, int y, int width, int height, 


Suggested change

virtual void scaledBitmap(const uint8_t* data, int x, int y, int width, int height,

leonardocavagnis · 2024-09-02T10:14:07Z

src/ArduinoGraphics.h

@@ -92,6 +94,8 @@ class ArduinoGraphics : public Print {

 protected:
  virtual void bitmap(const uint8_t* data, int x, int y, int width, int height);
+  virtual void scaledBitmap(const uint8_t* data, int x, int y, int width, int height, 
+                            uint8_t scale_x, uint8_t);


Suggested change

uint8_t scale_x, uint8_t);

leonardocavagnis · 2024-09-02T10:14:36Z

src/ArduinoGraphics.h

@@ -92,6 +94,8 @@ class ArduinoGraphics : public Print {

 protected:
  virtual void bitmap(const uint8_t* data, int x, int y, int width, int height);


Suggested change

virtual void bitmap(const uint8_t* data, int x, int y, int width, int height);

virtual void bitmap(const uint8_t* data, int x, int y, int w, int h, uint8_t scale_x = 1, uint8_t scale_y = 1);

leonardocavagnis · 2024-09-02T10:20:47Z

src/ArduinoGraphics.cpp

@@ -26,7 +26,9 @@
 ArduinoGraphics::ArduinoGraphics(int width, int height) :
  _width(width),
  _height(height),
-  _font(NULL)
+  _font(NULL),
+  _textsize_x(1),


Suggested change

_textsize_x(1),

_textSizeX(1),

leonardocavagnis · 2024-09-02T10:20:58Z

src/ArduinoGraphics.cpp

-  _font(NULL)
+  _font(NULL),
+  _textsize_x(1),
+  _textsize_y(1)


Suggested change

_textsize_y(1)

_textSizeY(1)

leonardocavagnis · 2024-09-02T10:21:12Z

examples/ASCIIDraw/ASCIIDraw.ino

@@ -85,6 +86,7 @@ void setup() {
  ASCIIDraw.stroke('@', 0, 0);
  const char text[] = "ARDUINO";
  ASCIIDraw.textFont(Font_5x7);
+  ASCIIDraw.setTextSize(fontSize);


Suggested change

ASCIIDraw.setTextSize(fontSize);

ASCIIDraw.textSize(fontSize);

leonardocavagnis · 2024-09-02T10:23:25Z

src/ArduinoGraphics.cpp

+  // forward to scaled version
+  scaledBitmap(data, x, y, width, height, 1, 1);
+}
+
+void ArduinoGraphics::scaledBitmap(const uint8_t* data, int x, int y, int w, int h, uint8_t scale_x, uint8_t scale_y) {


Suggested change

// forward to scaled version

scaledBitmap(data, x, y, width, height, 1, 1);

}

void ArduinoGraphics::scaledBitmap(const uint8_t* data, int x, int y, int w, int h, uint8_t scale_x, uint8_t scale_y) {

leonardocavagnis · 2024-09-02T10:23:36Z

src/ArduinoGraphics.cpp

+  _textsize_y = (sy > 0)? sy : 1;
+}
+
+
 void ArduinoGraphics::bitmap(const uint8_t* data, int x, int y, int width, int height)


Suggested change

void ArduinoGraphics::bitmap(const uint8_t* data, int x, int y, int width, int height)

void ArduinoGraphics::bitmap(const uint8_t* data, int x, int y, int w, int h, uint8_t scale_x, uint8_t scale_y)

I believe I pushed up the changes that were requested.
First attempt forgot to update the example sketch.

Let me know if I missed anything.

leonardocavagnis · 2024-09-02T13:18:37Z

Thank you for the changes!
Could you please rebase and merge the modifications into a single commit? Also, could you update the API documentation to include the textSize function?

github-actions · 2024-09-02T13:19:22Z

Memory usage change @ 7169c43

Board	flash	%	RAM for global variables	%
`arduino:samd:arduino_zero_edbg`	🔺 +316 - +316	+0.12 - +0.12	🔺 +3728 - +3728	+11.38 - +11.38
`arduino:samd:mkrzero`	🔺 +316 - +316	+0.12 - +0.12	🔺 +3728 - +3728	+11.38 - +11.38
`arduino:samd:nano_33_iot`	🔺 +316 - +316	+0.12 - +0.12	🔺 +3728 - +3728	+11.38 - +11.38

Click for full report table

Board	`examples/ASCIIDraw` flash	%	`examples/ASCIIDraw` RAM for global variables	%
`arduino:samd:arduino_zero_edbg`	316	0.12	3728	11.38
`arduino:samd:mkrzero`	316	0.12	3728	11.38
`arduino:samd:nano_33_iot`	316	0.12	3728	11.38

Click for full report CSV

Board,examples/ASCIIDraw<br>flash,%,examples/ASCIIDraw<br>RAM for global variables,%
arduino:samd:arduino_zero_edbg,316,0.12,3728,11.38
arduino:samd:mkrzero,316,0.12,3728,11.38
arduino:samd:nano_33_iot,316,0.12,3728,11.38

On larger displays, the two built in fonts are almost invisible. One possible solution is to supply some larger fonts. Another approach is to do, like several TFT display drivers do and allow you to scale the system fixed fonts up to a larger size. Decided this was the easiest approach, and did a quick implementation of it. Like the Adafruit displays, I allowed you to set different scale factors for X and Y. I added a scaledBitmap function which is a modified version of the current bitmap function. I also changed all of the text functions to use it. I left the unscalled version of the API, although I have it simply call the scaled version with scales 1 and 1, as since these methods are virtual, potentially some other subclasses might use and/or implement their own version. Updated the textFontWidth and textFontHeight to multiply the height * the scale as the one example sketch here needs it. I also updated the sketch to scale the canvas to take the font size into account. This appears to work with the changes and I have not used or tested the scroll code. Its sizing should be updated teh same way the test sketch was with the changes with the textFontWidth and textFontHeight changes Update api.md Forgot to update the AsciiDraw example sketch Code Review requested changes _textsize_x -> _textSizeX (ditto for y) setTextSize() -> textSize() scaledBitmap -> bitmap with the extra parameters with defaults

KurtE · 2024-09-02T13:37:39Z

Pushed up changes and squashed all down to 1...

github-actions · 2024-09-02T13:38:30Z

Memory usage change @ 0ea3666

Board	flash	%	RAM for global variables	%
`arduino:samd:arduino_zero_edbg`	🔺 +316 - +316	+0.12 - +0.12	🔺 +3728 - +3728	+11.38 - +11.38
`arduino:samd:mkrzero`	🔺 +316 - +316	+0.12 - +0.12	🔺 +3728 - +3728	+11.38 - +11.38
`arduino:samd:nano_33_iot`	🔺 +316 - +316	+0.12 - +0.12	🔺 +3728 - +3728	+11.38 - +11.38

Click for full report table

Board	`examples/ASCIIDraw` flash	%	`examples/ASCIIDraw` RAM for global variables	%
`arduino:samd:arduino_zero_edbg`	316	0.12	3728	11.38
`arduino:samd:mkrzero`	316	0.12	3728	11.38
`arduino:samd:nano_33_iot`	316	0.12	3728	11.38

Click for full report CSV

Board,examples/ASCIIDraw<br>flash,%,examples/ASCIIDraw<br>RAM for global variables,%
arduino:samd:arduino_zero_edbg,316,0.12,3728,11.38
arduino:samd:mkrzero,316,0.12,3728,11.38
arduino:samd:nano_33_iot,316,0.12,3728,11.38

per1234 added type: enhancement Proposed improvement topic: code Related to content of the project itself labels Aug 12, 2024

KurtE marked this pull request as ready for review August 12, 2024 18:50

KurtE mentioned this pull request Aug 13, 2024

Proper way to use Arduino_H7_Video with ArduinoGraphics.h on Giga Display Shield arduino/ArduinoCore-mbed#936

Closed

facchinm requested a review from leonardocavagnis August 28, 2024 08:34

leonardocavagnis requested changes Sep 2, 2024

View reviewed changes

leonardocavagnis linked an issue Sep 2, 2024 that may be closed by this pull request

Add API to set font size #3

Closed

KurtE force-pushed the text_size branch from bbf2530 to 0ea3666 Compare September 2, 2024 13:36

leonardocavagnis merged commit 4241408 into arduino-libraries:master Sep 2, 2024
6 checks passed

KurtE deleted the text_size branch September 2, 2024 14:26

leonardocavagnis mentioned this pull request Nov 4, 2024

Issues with void ArduinoGraphics::image(const Image& img, int x, int y, int width, int height) #46

Closed

leonardocavagnis linked an issue Nov 4, 2024 that may be closed by this pull request

Issues with void ArduinoGraphics::image(const Image& img, int x, int y, int width, int height) #46

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow the fixed fonts to be scaled up. #45

Allow the fixed fonts to be scaled up. #45

KurtE commented Aug 12, 2024 •

edited

Loading

github-actions bot commented Aug 12, 2024

KurtE commented Aug 12, 2024

leonardocavagnis left a comment

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

leonardocavagnis Sep 2, 2024

KurtE Sep 2, 2024

leonardocavagnis commented Sep 2, 2024

github-actions bot commented Sep 2, 2024

KurtE commented Sep 2, 2024

github-actions bot commented Sep 2, 2024

		@@ -92,6 +94,8 @@ class ArduinoGraphics : public Print {

		protected:
		virtual void bitmap(const uint8_t* data, int x, int y, int width, int height);

	ASCIIDraw.setTextSize(fontSize);
	ASCIIDraw.textSize(fontSize);

	void ArduinoGraphics::bitmap(const uint8_t* data, int x, int y, int width, int height)
	void ArduinoGraphics::bitmap(const uint8_t* data, int x, int y, int w, int h, uint8_t scale_x, uint8_t scale_y)

Allow the fixed fonts to be scaled up. #45

Allow the fixed fonts to be scaled up. #45

Conversation

KurtE commented Aug 12, 2024 • edited Loading

github-actions bot commented Aug 12, 2024

KurtE commented Aug 12, 2024

leonardocavagnis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leonardocavagnis commented Sep 2, 2024

github-actions bot commented Sep 2, 2024

KurtE commented Sep 2, 2024

github-actions bot commented Sep 2, 2024

KurtE commented Aug 12, 2024 •

edited

Loading