uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

graph update

Browse source
This commit is contained in:
Joel Bodenmann 2012-10-24 02:57:59 +02:00
parent 5ac6912648
commit 6005051ac7
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/graph.h
View file

@ -40,6 +40,7 @@ extern "C" {
void graphDrawOneQuadrat(Graph *g); void graphDrawOneQuadrat(Graph *g);
void graphDrawFourQuadrants(Graph *g); void graphDrawFourQuadrants(Graph *g);
void graphDrawDot(coord_t x, coord_t y, uint16_t radius, color_t color);
void graphDrawDots(int coord[][2], uint16_t entries, uint16_t radius, uint16_t color); void graphDrawDots(int coord[][2], uint16_t entries, uint16_t radius, uint16_t color);
void graphDrawNet(int coord[][2], uint16_t entries, uint16_t radius, uint16_t lineColor, uint16_t dotColor); void graphDrawNet(int coord[][2], uint16_t entries, uint16_t radius, uint16_t lineColor, uint16_t dotColor);

27
src/graph.c
View file

@ -72,13 +72,15 @@ void graphDrawOneQuadrant(Graph *g) {
/* X Axis */ /* X Axis */
gdispDrawLine(g->x0, g->y1, g->x1, g->y1, g->color); gdispDrawLine(g->x0, g->y1, g->x1, g->y1, g->color);
for(i = 0; i <= (length_y / g->grid_size); i++) if(g->grid_size > 0)
_horizontalDotLine(g->x0, g->y0 + g->grid_size * i, g->x1, g->dot_space, g->color); for(i = 0; i <= (length_y / g->grid_size); i++)
_horizontalDotLine(g->x0, g->y0 + g->grid_size * i, g->x1, g->dot_space, g->color);
/* Y Axis */ /* Y Axis */
gdispDrawLine(g->x0, g->y0, g->x0, g->y1, g->color); gdispDrawLine(g->x0, g->y0, g->x0, g->y1, g->color);
for(i = 0; i <= (length_x / g->grid_size); i++) if(g->grid_size > 0);
_verticalDotLine(g->x0 + g->grid_size * i, g->y0, g->y1, g->dot_space, g->color); for(i = 0; i <= (length_x / g->grid_size); i++)
_verticalDotLine(g->x0 + g->grid_size * i, g->y0, g->y1, g->dot_space, g->color);
} }
void graphDrawFourQuadrants(Graph *g) { void graphDrawFourQuadrants(Graph *g) {
@ -98,13 +100,22 @@ void graphDrawFourQuadrants(Graph *g) {
/* X Axis */ /* X Axis */
gdispDrawLine(g->x0, middle_y, g->x1, middle_y, g->color); gdispDrawLine(g->x0, middle_y, g->x1, middle_y, g->color);
for(i = 0; i <= (length_y / g->grid_size); i++) if(g->grid_size > 0)
_horizontalDotLine(g->x0, g->y0 + g->grid_size * i, g->x1, g->dot_space, g->color); for(i = 0; i <= (length_y / g->grid_size); i++)
_horizontalDotLine(g->x0, g->y0 + g->grid_size * i, g->x1, g->dot_space, g->color);
/* Y Axis */ /* Y Axis */
gdispDrawLine(middle_x, g->y0, middle_x, g->y1, g->color); gdispDrawLine(middle_x, g->y0, middle_x, g->y1, g->color);
for(i = 0; i <= (length_x / g->grid_size); i++) if(g->grid_size > 0)
_verticalDotLine(g->x0 + g->grid_size * i, g->y0, g->y1, g->dot_space, g->color); for(i = 0; i <= (length_x / g->grid_size); i++)
_verticalDotLine(g->x0 + g->grid_size * i, g->y0, g->y1, g->dot_space, g->color);
}
void graphDrawDot(coord_t x, coord_t y, uint16_t radius, color_t color) {
if(radius == 1)
gdispDrawPixel(origin.x + x, origin.y + y, color);
else
gdispFillCircle(origin.x + x, origin.y + y, radius, color);
} }
void graphDrawDots(int coord[][2], uint16_t entries, uint16_t radius, uint16_t color) { void graphDrawDots(int coord[][2], uint16_t entries, uint16_t radius, uint16_t color) {