piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

drawCircle and drawFilledCircle re-added

Browse Source
This commit is contained in:
Bertrand Songis
2020-01-08 10:12:52 +01:00
parent 60d4ba17cd
commit b6e328ef40
2 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
Vendored Regular → Executable
+51 -26
View File
@@ -211,32 +211,57 @@ void BitmapBuffer::drawFilledRect(coord_t x, coord_t y, coord_t w, coord_t h, ui
// }
//}
//
//void BitmapBuffer::drawCircle(int x0, int y0, int radius)
//{
// int x = radius;
// int y = 0;
// int decisionOver2 = 1 - x;
//
// while (y <= x) {
// drawPixel(x+x0, y+y0, WHITE);
// drawPixel(y+x0, x+y0, WHITE);
// drawPixel(-x+x0, y+y0, WHITE);
// drawPixel(-y+x0, x+y0, WHITE);
// drawPixel(-x+x0, -y+y0, WHITE);
// drawPixel(-y+x0, -x+y0, WHITE);
// drawPixel(x+x0, -y+y0, WHITE);
// drawPixel(y+x0, -x+y0, WHITE);
// y++;
// if (decisionOver2 <= 0) {
// decisionOver2 += 2*y + 1;
// }
// else {
// x--;
// decisionOver2 += 2 * (y-x) + 1;
// }
// }
//}
//
void BitmapBuffer::drawCircle(coord_t x, coord_t y, coord_t radius, LcdFlags flags)
{
int x1 = radius;
int y1 = 0;
int decisionOver2 = 1 - x1;
pixel_t color = lcdColorTable[COLOR_IDX(flags)];
APPLY_OFFSET();
while (y1 <= x1) {
drawPixel(x1 + x, y1 + y, color);
drawPixel(y1 + x, x1 + y, color);
drawPixel(-x1 + x, y1 + y, color);
drawPixel(-y1 + x, x1 + y, color);
drawPixel(-x1 + x, -y1 + y, color);
drawPixel(-y1 + x, -x1 + y, color);
drawPixel(x1 + x, -y1 + y, color);
drawPixel(y1 + x, -x1 + y, color);
y1++;
if (decisionOver2 <= 0) {
decisionOver2 += 2 * y1 + 1;
}
else {
x1--;
decisionOver2 += 2 * (y1 - x1) + 1;
}
}
}
void BitmapBuffer::drawFilledCircle(coord_t x, coord_t y, coord_t radius, LcdFlags flags)
{
coord_t imax = ((coord_t)((coord_t)radius * 707)) / 1000 + 1;
coord_t sqmax = (coord_t)radius * (coord_t)radius + (coord_t)radius / 2;
coord_t x1 = radius;
drawSolidHorizontalLine(x - radius, y, radius * 2, flags);
for (coord_t i = 1; i <= imax; i++) {
if ((i * i + x1 * x1) > sqmax) {
// Draw lines from outside
if (x1 > imax) {
drawSolidHorizontalLine(x - i + 1, y + x1, (i - 1) * 2, flags);
drawSolidHorizontalLine(x - i + 1, y - x1, (i - 1) * 2, flags);
}
x1--;
}
// Draw lines from inside (center)
drawSolidHorizontalLine(x - x1, y + i, x1 * 2, flags);
drawSolidHorizontalLine(x - x1, y - i, x1 * 2, flags);
}
}
//bool evalSlopes(int * slopes, int startAngle, int endAngle)
//{
// if (startAngle >= 360 || endAngle <= 0)
radio/src/thirdparty/libopenui/src/bitmapbuffer.h
Vendored Regular → Executable
+3 -1
View File
@@ -354,7 +354,9 @@ class BitmapBuffer: public BitmapBufferBase<uint16_t>
void invertRect(coord_t x, coord_t y, coord_t w, coord_t h, LcdFlags flags = 0);
void drawCircle(int x0, int y0, int radius);
void drawCircle(coord_t x, coord_t y, coord_t radius, LcdFlags flags = 0);
void drawFilledCircle(coord_t x, coord_t y, coord_t radius, LcdFlags flags = 0);
void drawPie(int x0, int y0, int radius, int startAngle, int endAngle);