Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
@zwim
zwim committed Apr 8, 2024
1 parent 8f443bc commit b817821
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 39 deletions.
8 changes: 4 additions & 4 deletions include/gfx_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class Graphics2D {
* @param color color code of the circle
* @param option
*/
void drawCircle(int16_t x0, int16_t y0, int16_t rad, uint16_t color, CIRC_OPT option = DRAW_ALL);
void drawCircle(int16_t x0, int16_t y0, int16_t rad, uint16_t color, CIRC_OPT option = DRAW_ALL);

/**
* @brief Draw an anti-aliased circle with thicknes
Expand All @@ -217,10 +217,10 @@ class Graphics2D {
* @param bw thickness of th circle
* @param color color code of the circle
*/
void drawCircleAA(int16_t off_x, int16_t off_y, int16_t r, int16_t bw, uint16_t color,
void drawCircleAA(int16_t off_x, int16_t off_y, int16_t r, int16_t bw, uint16_t color,
int16_t start_angle = 0, int16_t end_angle = 0);

inline void fillCircleAA(int16_t off_x, int16_t off_y, int16_t r, uint16_t color){
inline void fillCircleAA(int16_t off_x, int16_t off_y, int16_t r, uint16_t color){
drawCircleAA(off_x, off_y, r, r-1, color);
}

Expand All @@ -233,7 +233,7 @@ class Graphics2D {
void fillEllipse(uint16_t x0, uint16_t y0, uint16_t rx, uint16_t ry, uint16_t color, CIRC_OPT option = DRAW_ALL);
void drawRFrame(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t r, uint16_t color);
void fillRFrame(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t r, uint16_t color);

inline void drawTick(int16_t cx, int16_t cy, int16_t r1, int16_t r2, float angle, uint16_t color) {
drawLine(rpx(cx, r1, angle), rpy(cy, r1, angle), rpx(cx, r2, angle), rpy(cy, r2, angle), color);
}
Expand Down
8 changes: 2 additions & 6 deletions src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void OswAppWatchfaceFitnessAnalog::drawWatchFace(OswHal *hal, uint32_t hour, uin
// Indices
hal->gfx()->drawMinuteTicks(CENTER_X, CENTER_Y, 116, 112, ui->getForegroundDimmedColor(), true);
hal->gfx()->drawHourTicks(CENTER_X, CENTER_Y, 117, 107, ui->getForegroundColor(), true);

// Hours
hal->gfx()->drawThickTick(CENTER_X, CENTER_Y, 0, 16, (int)(360.0f / 12.0f * (hour + minute / 60.0f)), 3, ui->getForegroundColor(), true, STRAIGHT_END);
hal->gfx()->drawThickTick(CENTER_X, CENTER_Y, 16, 60, (int)(360.0f / 12.0f * (hour + minute / 60.0f)), 7, ui->getForegroundColor(), true);
Expand All @@ -108,10 +108,6 @@ void OswAppWatchfaceFitnessAnalog::drawWatchFace(OswHal *hal, uint32_t hour, uin
hal->gfx()->fillCircleAA(CENTER_X, CENTER_Y, 6, ui->getDangerColor());
hal->gfx()->drawThickTick(CENTER_X, CENTER_Y, -16, 110, 360 / 60 * second, 3, ui->getDangerColor(), true);
#endif

#ifdef GIF_BG
OswAppGifPlayer* bgGif = new OswAppGifPlayer();
#endif
}

void OswAppWatchfaceFitnessAnalog::drawDateFace(OswHal *hal, uint32_t hour, uint32_t minute, uint32_t second, bool afterNoon) {
Expand Down Expand Up @@ -157,7 +153,7 @@ void OswAppWatchfaceFitnessAnalog::drawDateFace(OswHal *hal, uint32_t hour, uint
}

#if OSW_PLATFORM_ENVIRONMENT_TEMPERATURE == 1
/*
/*
printStatus("Temperature", String(hal->environment()->getTemperature() + String("C")).c_str());
for(auto& d : *OswTemperatureProvider::getAllTemperatureDevices())
printStatus((String(" ") + d->getName()).c_str(), String(d->getTemperature() + String("C")).c_str());
Expand Down
58 changes: 29 additions & 29 deletions src/gfx_2d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void Graphics2D::enableBuffer() {
// buffer[i] = new uint16_t[chunkWidth * chunkHeight];
if (allocatePsram) {
#if defined(GPS_EDITION) || defined(GPS_EDITION_ROTATED)
buffer[i] = (uint16_t*)ps_malloc((width << chunkHeightLD) * sizeof(uint16_t));
buffer[i] = (uint16_t*)ps_malloc((width << chunkHeightLd) * sizeof(uint16_t));
#else
buffer[i] = new uint16_t[width << chunkHeightLd]();
#endif
Expand All @@ -63,7 +63,7 @@ void Graphics2D::enableBuffer() {
// (uint8_t*) malloc( BufferSize * sizeof(uint8_t) )
if (allocatePsram) {
#if defined(GPS_EDITION) || defined(GPS_EDITION_ROTATED)
buffer[i] = (uint16_t*)ps_malloc(width * chunkHeight * sizeof(uint16_t));
buffer[i] = (uint16_t*)ps_malloc((width << chunkHeightLd) * sizeof(uint16_t));
#else
buffer[i] = new uint16_t[width << chunkHeightLd]();
#endif
Expand Down Expand Up @@ -298,22 +298,22 @@ void Graphics2D::drawLineAA(int32_t x0, int32_t y0, int32_t x1, int32_t y1, cons

for ( ; ; ){ /* pixel loop */
drawPixelAA(x0, y0, color, 255-255*abs(err-dx+dy)/ed);
e2 = err;
e2 = err;
x2 = x0;
if (2*e2 >= -dx) { /* x step */
if (x0 == x1)
if (x0 == x1)
break;
if (e2+dy < ed)
if (e2+dy < ed)
drawPixelAA(x0, y0+sy, color, 255-255*(e2+dy)/ed);
err -= dy;
err -= dy;
x0 += sx;
}
if (2*e2 <= dy) { /* y step */
if (y0 == y1)
if (y0 == y1)
break;
if (dx-e2 < ed)
if (dx-e2 < ed)
drawPixelAA(x2+sx, y0, color, 255-255*(dx-e2)/ed);
err += dx;
err += dx;
y0 += sy;
}
}
Expand Down Expand Up @@ -419,11 +419,11 @@ void Graphics2D::drawThickLine(int32_t x1, int32_t y1, int32_t x2, int32_t y2, u
* @param line_width thickness of the line
* @param color color code use to draw the line.
*/
void Graphics2D::drawThickLineAA(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t line_width,
const uint16_t color, LINE_END_OPT eol) {
// thanks to https://github.com/foo123/Rasterizer
void Graphics2D::drawThickLineAA(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t line_width,
const uint16_t color, LINE_END_OPT eol) {
// thanks to https://github.com/foo123/Rasterizer

int32_t tmp,
int32_t tmp,
sx, sy,
w, w2, wx, wy,
wsx, wsy,
Expand Down Expand Up @@ -460,7 +460,7 @@ void Graphics2D::drawThickLineAA(int32_t x0, int32_t y0, int32_t x1, int32_t y1,

n = hypotf(dx, dy) + 0.5f; //sqrtf(dx*dx + dy*dy) + 0.5f;
// more readable: wx = (dy*w/2 + (n/2))/n; where (n/2) is for rounding
wx = (dy*w+n)/2/n; // +1 is for rounding of /2
wx = (dy*w+n)/2/n; // +1 is for rounding of /2
wy = (dx*w+n)/2/n;

// printf("xxx x0=%d, y0=%d, x1=%d, y1=%d, dx=%d, dy=%d, w2=%d, wx=%d, wy=%d, %d, %d\n", x0, y0, x1, y1, dx, dy, w2, wx, wy);
Expand Down Expand Up @@ -529,7 +529,7 @@ d: y1 - wsy - y1 = -(x - x1)/m => x = x1 + m*wsy: (xe+wsx, y1-wsy)
default:
break;
}

/*
// Center pixel
drawPixel(x0, y0, rgb565(255,255,0));
Expand All @@ -544,7 +544,7 @@ d: y1 - wsy - y1 = -(x - x1)/m => x = x1 + m*wsy: (xe+wsx, y1-wsy)
}

void Graphics2D::drawFilledTriangle(int32_t ax, int32_t ay, int32_t bx, int32_t by, int32_t cx, int32_t cy, const uint16_t color) {
int32_t tmp,
int32_t tmp,
x, xx, y,
xac, xab, xbc,
yac, yab, ybc,
Expand All @@ -555,15 +555,15 @@ void Graphics2D::drawFilledTriangle(int32_t ax, int32_t ay, int32_t bx, int32_t

if (ay > by) {
tmp = ax; ax = bx; bx = tmp;
tmp = ay; ay = by; by = tmp;
tmp = ay; ay = by; by = tmp;
}
if (ay > cy) {
tmp = ax; ax = cx; cx = tmp;
tmp = ay; ay = cy; cy = tmp;
tmp = ay; ay = cy; cy = tmp;
}
if (by > cy) {
tmp = bx; bx = cx; cx = tmp;
tmp = by; by = cy; cy = tmp;
tmp = by; by = cy; cy = tmp;
}

yac = cy - ay;
Expand Down Expand Up @@ -605,13 +605,13 @@ void Graphics2D::drawFilledTriangle(int32_t ax, int32_t ay, int32_t bx, int32_t
}
}
if (x > xx) { // left handed ;-)
tmp = x; x = xx; xx = tmp;
tmp = x; x = xx; xx = tmp;
}

if (abs(xx-x) <= 0) {
drawPixel(x, y, color);
} else {
for (x = x; x < xx; ++x)
for (x = x; x < xx; ++x)
drawPixel(x, y, color);
}
}
Expand Down Expand Up @@ -734,13 +734,13 @@ bool Graphics2D::isPixelMaskedByAngles(int32_t x, int32_t y) {
if (x-ox >= 0 && y-oy <= 0 && tan_pixel < tan_sa)
return true;
} else if (start_angle < 180) {
if (x-ox >= 0 && y-oy <= 0)
if (x-ox >= 0 && y-oy <= 0)
return true; // 1.quadrant
else if (x-ox < 0 && y-oy <= 0)
else if (x-ox < 0 && y-oy <= 0)
if (tan_pixel < 0 && tan_pixel < tan_sa)
return true; // 2.quadrant
} else if (start_angle < 270) {
if (x-ox >= 0 && y-oy <= 0)
if (x-ox >= 0 && y-oy <= 0)
return true; // 1.quadrant
else if (x-ox < 0 && y-oy <= 0)
return true; // 2.quadrant
Expand Down Expand Up @@ -768,17 +768,17 @@ bool Graphics2D::isPixelMaskedByAngles(int32_t x, int32_t y) {
else if (x-ox >= 0 && y-oy >0)
return true; // 4. quadrant
} else if (end_angle < 180) {
if (x-ox < 0 && y-oy <= 0 && tan_pixel > tan_ea)
if (x-ox < 0 && y-oy <= 0 && tan_pixel > tan_ea)
return true; // 2.quadrant
else if (y-oy >= 0)
else if (y-oy >= 0)
return true; // 3.&4.quadrant
} else if (end_angle < 270) {
if (x-oy <= 0 && y-oy >= 0 && tan_pixel > tan_ea)
return true; // 3.quadrant
else if (x-ox >= 0 && y-oy >= 0)
return true; // 4.quadrant
} else if (end_angle <= 360) {
if (x-ox >= 0 && y-oy >= 0 && tan_pixel >= tan_ea)
if (x-ox >= 0 && y-oy >= 0 && tan_pixel >= tan_ea)
return true; // 4.quadrant
}
}
Expand All @@ -795,7 +795,7 @@ bool Graphics2D::isPixelMaskedByAngles(int32_t x, int32_t y) {
* @param bw thickness of th circle
* @param color color code of the circle
*/
void Graphics2D::drawCircleAA(int16_t off_x, int16_t off_y, int16_t r, int16_t bw,
void Graphics2D::drawCircleAA(int16_t off_x, int16_t off_y, int16_t r, int16_t bw,
uint16_t color, int16_t sa, int16_t ea) {

int x0 = -r;
Expand Down Expand Up @@ -827,7 +827,7 @@ void Graphics2D::drawCircleAA(int16_t off_x, int16_t off_y, int16_t r, int16_t b
if (x0 > x1) { // if called with swapped points
x0 = x1;
x1 += o_diam;
}
}
if (y0 > y1)
y0 = y1; // .. exchange them
if (a2 <= 0)
Expand Down

0 comments on commit b817821

Please sign in to comment.