diff options
author | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-10-25 00:36:15 +0200 |
---|---|---|
committer | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-10-25 00:36:15 +0200 |
commit | 56b350d096b881a685650bc080598f4e96f2b45d (patch) | |
tree | df038d1c126fb4447546cf4754233d5d17f85a06 | |
parent | 7cebc4283193eca6167b3a7c02ef25340ef1adcd (diff) | |
download | uGFX-56b350d096b881a685650bc080598f4e96f2b45d.tar.gz uGFX-56b350d096b881a685650bc080598f4e96f2b45d.tar.bz2 uGFX-56b350d096b881a685650bc080598f4e96f2b45d.zip |
graph fix
-rw-r--r-- | src/graph.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/graph.c b/src/graph.c index 8a270251..c3aa9586 100644 --- a/src/graph.c +++ b/src/graph.c @@ -89,9 +89,9 @@ bool_t _boundaryCheck(Graph *g, coord_t x, coord_t y) { return 1; if(g->origin_x + x < g->x0) return 1; - if(g->origin_y + y < g->y1) + if(g->origin_y - y < g->y1) return 1; - if(g->origin_y + y > g->y0) + if(g->origin_y - y > g->y0) return 1; return 0; @@ -102,9 +102,9 @@ void graphDrawDot(Graph *g, coord_t x, coord_t y, uint16_t radius, color_t color return; if(radius == 0) - gdispDrawPixel(g->origin_x + x, g->origin_y + y, color); + gdispDrawPixel(g->origin_x + x, g->origin_y - y, color); else - gdispFillCircle(g->origin_x + x, g->origin_y + y, radius, color); + gdispFillCircle(g->origin_x + x, g->origin_y - y, radius, color); } void graphDrawDots(Graph *g, int coord[][2], uint16_t entries, uint16_t radius, uint16_t color) { @@ -137,8 +137,10 @@ void graphDrawNet(Graph *g, int coord[][2], uint16_t entries, uint16_t radius, u if(_boundaryCheck(g, coord[i][0], coord[i][1])) continue; - if(radius != 0) - lcdFillCircle(coord[i][0] + g->origin_x, g->origin_y - coord[i][1], radius, dotColor); + if(radius == 0) + gdispDrawPixel(coord[i][0] + g->origin_x, g->origin_y - coord[i][1], dotColor); + else + gdispFillCircle(coord[i][0] + g->origin_x, g->origin_y - coord[i][1], radius, dotColor); } } |