From 834e5c2b0fed00cc96729f9b125c669e2b61e800 Mon Sep 17 00:00:00 2001 From: DE8MSH Date: Mon, 24 Jul 2023 17:06:22 +0200 Subject: [PATCH] Update lcd.hpp --- libs/lcd/lcd.hpp | 76 ------------------------------------------------ 1 file changed, 76 deletions(-) diff --git a/libs/lcd/lcd.hpp b/libs/lcd/lcd.hpp index e28be9b..02dd7f2 100644 --- a/libs/lcd/lcd.hpp +++ b/libs/lcd/lcd.hpp @@ -86,85 +86,9 @@ class CDisplay } } - void DrawCircle(unsigned char cx, unsigned char cy, unsigned int r, bool bFilled = false) - { - int x = 0; - int y = r; - int d = 3 - 2 * r; - if (!r) - return; - - while (y >= x) - { - // when bFilled is true, draw lines to fill the circle - if (bFilled) - { - DrawLine(cx - x, cx + x, cy - y); - DrawLine(cx - y, cx + y, cy - x); - DrawLine(cx - x, cx + x, cy + y); - DrawLine(cx - y, cx + y, cy + x); - } - else - { - if (cx + x < Bitmap.SizeX && cy + y < Bitmap.SizeY) - Bitmap.SetPixel(cx + x, cy - y); // 1st quarter - if (cx + y < Bitmap.SizeX && cy + x < Bitmap.SizeY) - Bitmap.SetPixel(cx + y, cy - x); // 2nd quarter - if (cx - x >= 0 && cy + y < Bitmap.SizeY) - Bitmap.SetPixel(cx - x, cy - y); // 3rd quarter - if (cx - y >= 0 && cy + x < Bitmap.SizeY) - Bitmap.SetPixel(cx - y, cy - x); // 4th quarter - if (cx + x < Bitmap.SizeX && cy + y < Bitmap.SizeY) - Bitmap.SetPixel(cx + x, cy + y); // 5th quarter - if (cx + y < Bitmap.SizeX && cy - x >= 0) - Bitmap.SetPixel(cx + y, cy + x); // 6th quarter - if (cx - x >= 0 && cy - y >= 0) - Bitmap.SetPixel(cx - x, cy + y); // 7th quarter - if (cx - y >= 0 && cy - x >= 0) - Bitmap.SetPixel(cx - y, cy + x); // 8th quarter - } - x++; - if (d < 0) - d += 4 * x + 6; - else - { - y--; - d += 4 * (x - y) + 10; - } - } - } - - void DrawRectangle(unsigned char sx, unsigned char sy, unsigned char width, unsigned char height, bool bFilled) - { - unsigned char maxX = (sx + width < Bitmap.SizeX) ? sx + width : Bitmap.SizeX; - unsigned char maxY = (sy + height < Bitmap.SizeY) ? sy + height : Bitmap.SizeY; - // Draw vertical lines - for (unsigned char y = sy; y < maxY; y++) - { - Bitmap.SetPixel(sx, y); - Bitmap.SetPixel(maxX - 1, y); - } - // Draw horizontal lines - for (unsigned char x = sx; x < maxX; x++) - { - Bitmap.SetPixel(x, sy); - Bitmap.SetPixel(x, maxY - 1); - } - // If filled, draw horizontal lines within the rectangle - if (bFilled) - { - for (unsigned char x = sx + 1; x < maxX - 1; x++) - { - for (unsigned char y = sy + 1; y < maxY - 1; y++) - { - Bitmap.SetPixel(x, y); - } - } - } - } unsigned char PrintCharacter(const char c8Character) const {