Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

default font and drawtext font override #569

Merged
merged 1 commit into from
Mar 1, 2023
Merged

default font and drawtext font override #569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 41 additions & 27 deletions ...Meadow.Foundation.Libraries_and_Frameworks/Graphics.MicroGraphics/Driver/MicroGraphics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,16 @@ public partial class MicroGraphics
/// </summary>
public IFont CurrentFont
{
get => currentFont;
get
{
// lazy load
if (currentFont == null)
{
currentFont = new Font6x8();
}

return currentFont;
}
set
{
currentFont = value;
Expand All @@ -41,7 +50,7 @@ public IFont CurrentFont
DisplayConfig.Height = (ushort)(Height / CurrentFont.Height);
}
}
IFont currentFont;
IFont? currentFont = null;

/// <summary>
/// Current color mode
Expand Down Expand Up @@ -295,6 +304,7 @@ public void DrawLine(int x, int y, int length, float angle, Color color)
/// <param name="y0">Ordinate of the starting point of the line</param>
/// <param name="x1">Abscissa of the end point of the line</param>
/// <param name="y1">Ordinate of the end point of the line</param>
/// <param name="color">Color of the line to be drawn</param>
public void DrawLine(int x0, int y0, int x1, int y1, Color color)
{
if (y0 == y1)
Expand Down Expand Up @@ -1224,22 +1234,26 @@ public Size MeasureText(string text, IFont font, ScaleFactor scaleFactor = Scale
/// <param name="scaleFactor">Scalefactor used to calculate the size</param>
/// <param name="alignmentH">Horizontal alignment: Left, Center or right aligned text</param>
/// <param name="alignmentV">Vertical alignment: Top, Center or bottom aligned text</param>
/// <param name="font">Optional font used to draw the text</param>
public void DrawText(int x, int y, string text, Color color,
ScaleFactor scaleFactor = ScaleFactor.X1,
HorizontalAlignment alignmentH = HorizontalAlignment.Left,
VerticalAlignment alignmentV = VerticalAlignment.Top)
VerticalAlignment alignmentV = VerticalAlignment.Top,
IFont? font = null)
{
if (CurrentFont == null)
var fontToDraw = font != null ? font : CurrentFont;

if (fontToDraw == null)
{
throw new Exception("CurrentFont must be set before calling DrawText.");
}

byte[] bitMap = GetBytesForTextBitmap(text);
byte[] bitMap = GetBytesForTextBitmap(text, fontToDraw);

x = GetXForAlignment(x, MeasureText(text, scaleFactor).Width, alignmentH);
y = GetYForAlignment(y, MeasureText(text, scaleFactor).Height, alignmentV);

DrawBitmap(x, y, bitMap.Length / CurrentFont.Height * 8, CurrentFont.Height, bitMap, color, scaleFactor);
DrawBitmap(x, y, bitMap.Length / fontToDraw.Height * 8, fontToDraw.Height, bitMap, color, scaleFactor);
}

/// <summary>
Expand Down Expand Up @@ -1373,43 +1387,43 @@ public void DrawText(int x, int y, string text,
DrawText(x, y, text, PenColor, scaleFactor, alignmentH, alignmentV);
}

private byte[] GetBytesForTextBitmap(string text)
private byte[] GetBytesForTextBitmap(string text, IFont font)
{
byte[] bitmap;

if (CurrentFont.Width == 8) //just copy bytes
if (font.Width == 8) //just copy bytes
{
bitmap = new byte[text.Length * CurrentFont.Height * (CurrentFont.Width >> 3)];
bitmap = new byte[text.Length * font.Height * (font.Width >> 3)];

byte[] characterMap;

for (int i = 0; i < text.Length; i++)
{
characterMap = CurrentFont[text[i]];
characterMap = font[text[i]];

//copy data for 1 character at a time going top to bottom
for (int segment = 0; segment < CurrentFont.Height; segment++)
for (int segment = 0; segment < font.Height; segment++)
{
bitmap[i + (segment * text.Length)] = characterMap[segment];
}
}
}
else if (CurrentFont.Width == 12)
else if (font.Width == 12)
{
var len = ((text.Length + text.Length % 2) * 3) >> 1;
bitmap = new byte[len * CurrentFont.Height];
bitmap = new byte[len * font.Height];

byte[] charMap1, charMap2;
int index = 0;

for (int i = 0; i < text.Length; i += 2) //2 chracters, 3 bytes ... 24 bytes total so the math is good
{
//grab two characters at once
charMap1 = CurrentFont[text[i]];
charMap2 = (i + 1 < text.Length) ? CurrentFont[text[i + 1]] : CurrentFont[' '];
charMap1 = font[text[i]];
charMap2 = (i + 1 < text.Length) ? font[text[i + 1]] : font[' '];

int cIndex = 0;
for (int j = 0; j < CurrentFont.Height; j += 2)
for (int j = 0; j < font.Height; j += 2)
{
//first row - spans 3 bytes (for 2 chars)
bitmap[index + (j) * len + 0] = charMap1[cIndex]; //good
Expand All @@ -1426,7 +1440,7 @@ private byte[] GetBytesForTextBitmap(string text)
index += 3;
}
}
else if (CurrentFont.Width == 6)
else if (font.Width == 6)
{
var len = text.Length;

Expand All @@ -1436,21 +1450,21 @@ private byte[] GetBytesForTextBitmap(string text)
}
len = len * 3 / 4; //length in bytes

bitmap = new byte[len * CurrentFont.Height];
bitmap = new byte[len * font.Height];

byte[] charMap1, charMap2, charMap3, charMap4;
int index = 0;

for (int i = 0; i < len; i += 3)
{
//grab four characters at once
charMap1 = CurrentFont[text[index++]];
charMap2 = (index < text.Length) ? CurrentFont[text[index++]] : CurrentFont[' '];
charMap3 = (index < text.Length) ? CurrentFont[text[index++]] : CurrentFont[' '];
charMap4 = (index < text.Length) ? CurrentFont[text[index++]] : CurrentFont[' '];
charMap1 = font[text[index++]];
charMap2 = (index < text.Length) ? font[text[index++]] : font[' '];
charMap3 = (index < text.Length) ? font[text[index++]] : font[' '];
charMap4 = (index < text.Length) ? font[text[index++]] : font[' '];

int cIndex = 0;
for (int j = 0; j < CurrentFont.Height; j += 4)
for (int j = 0; j < font.Height; j += 4)
{
//first row
bitmap[i + (j + 0) * len + 0] = (byte)((charMap1[cIndex] & 0x3F) | (charMap2[cIndex] << 6));
Expand All @@ -1476,17 +1490,17 @@ private byte[] GetBytesForTextBitmap(string text)
}
}
}
else if (CurrentFont.Width == 4)
else if (font.Width == 4)
{
var len = (text.Length + text.Length % 2) >> 1;
bitmap = new byte[len * CurrentFont.Height];
bitmap = new byte[len * font.Height];
byte[] charMap1, charMap2;

for (int i = 0; i < len; i++)
{
//grab two characters at once to fill a complete byte
charMap1 = CurrentFont[text[2 * i]];
charMap2 = (2 * i + 1 < text.Length) ? CurrentFont[text[2 * i + 1]] : CurrentFont[' '];
charMap1 = font[text[2 * i]];
charMap2 = (2 * i + 1 < text.Length) ? font[text[2 * i + 1]] : font[' '];

for (int j = 0; j < charMap1.Length; j++)
{
Expand Down