restructorizing

3 files changed, 110 insertions, 0 deletions

diff --git a/graph/graph.c b/graph/graph.c
new file mode 100644
index 00000000..b9ce8739
--- /dev/null
+++ b/graph/graph.c
@@ -0,0 +1,55 @@
+#include "glcd.h"
+
+#define MARKSIZE	5 	// half
+
+static uint16_t x, y;			// origins in graph
+static uint16_t grid_X, grid_Y;	//grids
+
+void graphDrawSystem(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t gridX, uint16_t gridY, uint16_t color) {
+	uint16_t i, length;
+	volatile uint16_t off;
+
+	x = x0;
+	y = y0;
+	grid_X = gridX;
+	grid_Y = gridY;
+
+	// X-Axis
+	length = x1 - x0;
+	lcdDrawLine(x0, y0, x1, y0, color);
+	lcdDrawLine(x1, y0, x1-5, y0+5, color);
+	lcdDrawLine(x1, y0, x1-5, y0-5, color);	
+	for(i=1; i<(length / grid_X); i++) {
+		off = x0 + i * grid_X;
+		lcdDrawLine(off, y0-MARKSIZE, off, y0+MARKSIZE, color);
+	}
+
+	// Y-Axis
+	length = y0 - y1;
+	lcdDrawLine(x0, y0, x0, y1, color);
+	lcdDrawLine(x0, y1, x0-5, y1+5, color);
+	lcdDrawLine(x0, y1, x0+5, y1+5, color);
+	for(i=1; i<(length / grid_Y); i++) {
+		off = y0 + i * grid_Y;
+		lcdDrawLine(x0-MARKSIZE, off, x0+MARKSIZE, off, color);	
+	}
+}
+
+void graphDrawDots(int coord[][2], uint16_t entries, uint16_t radius, uint16_t color) {
+	uint16_t i;
+
+	for(i = 0; i < entries; i++)
+		lcdDrawCircle(coord[i][0]+x, y-coord[i][1], radius, 1, color);
+}
+
+void graphDrawNet(int coord[][2], uint16_t entries, uint16_t radius, uint16_t lineColor, uint16_t dotColor) {
+	uint16_t i;
+
+	for(i = 0; i < entries; ++i)
+		lcdDrawLine(coord[i-1][0]+x, y-coord[i-1][1], coord[i][0]+x, y-coord[i][1], lineColor); 
+	for(i = 0; i < entries; ++i)
+		if(radius != 0)
+			lcdDrawCircle(coord[i][0]+x, y-coord[i][1], radius, 1, dotColor);
+}
+
+
diff --git a/graph/graph.h b/graph/graph.h
new file mode 100644
index 00000000..d0ebd2c2
--- /dev/null
+++ b/graph/graph.h
@@ -0,0 +1,52 @@
+#ifndef GRAPH_H
+#define GRAPH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * Description: does draw axis arrows and grid
+ *
+ * param:
+ *		- x0, y0, x1, y1:	location of arrows
+ *		- gridX, gridY:		grid size in X and Y direction
+ *		- color:			color of arrows
+ *
+ * return: none
+ */
+void graphDrawSystem(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t gridX, uint16_t gridY, uint16_t color);
+
+/*
+ * Description: does draw coordinates into graph as dots
+ *
+ * param:
+ *		- coord:		two dimensionl array containing X and Y coordinates
+ *		- entries:		amount of coordinates passed (sizeof(coord)/sizeof(coord[0])
+ *		- radius:		size of the dots
+ *		- color:		color of the dots
+ *
+ * return: none
+ */
+void graphDrawDots(int coord[][2], uint16_t entries, uint16_t radius, uint16_t color);
+
+/*
+ * Description: does draw coordinates into graph connected by lines
+ *
+ * param:
+ *		- coord:		two dimensional array containing X and Y coordinates
+ *		- entries:		amount of coordinates passed (sizeof(coord)/sizeof(coord[0])
+ *		- radius:		if not 0, graphDrawDots() gets invoked
+ *		- lineColor:	color of the lines
+ *		- dotColor:		color of dots, if radius != 0
+ *
+ * return: none
+ */	
+void graphDrawNet(int coord[][2], uint16_t entries, uint16_t radius, uint16_t lineColor, uint16_t dotColor);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/graph/graph.mk b/graph/graph.mk
new file mode 100644
index 00000000..706a9412
--- /dev/null
+++ b/graph/graph.mk
@@ -0,0 +1,3 @@
+LCD_GRAPH_SRC =		$(LCDLIB)/graph/graph.c 
+
+LCD_GRAPH_INC =		$(LCDLIB)/graph