X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fcharts.c;h=f305744ca163f0fba6a09a73a9f9ce184509f7eb;hb=b329fe228f081ec0d011874dfb3774e515648053;hp=469f6f28a1d4b2f9dab046e8b9e3ab1c1cd9fc23;hpb=d2781083b8f0cffe71696623a4a78f2bf252d295;p=bertos.git

diff --git a/mware/charts.c b/mware/charts.c
index 469f6f28..f305744c 100755
--- a/mware/charts.c
+++ b/mware/charts.c
@@ -26,6 +26,9 @@
 
 /*
  * $Log$
+ * Revision 1.3  2004/08/11 19:39:12  bernie
+ * Use chart_x_t and chart_y_t for the input dataset.
+ *
  * Revision 1.1  2004/08/04 03:16:30  bernie
  * Import simple chart drawing code.
  *
@@ -35,38 +38,18 @@
 #include <mware/gfx.h>
 
 
-static Bitmap ChartBitmap;
-
-/*!
- * Raster buffer to draw into.
- *
- * Bits in the bitmap bytes have vertical orientation,
- * as required by the printer driver.
- */
-DECLARE_WALL(wall_before_raster, WALL_SIZE)
-static uint8_t ChartRaster[BM_WIDTH * ((BM_HEIGHT + 7) / 8)];
-DECLARE_WALL(wall_after_raster, WALL_SIZE)
-
-
-Bitmap *chart_init(vcoord_t xmin, vcoord_t ymin, vcoord_t xmax, vcoord_t ymax)
+void chart_init(Bitmap *bm, vcoord_t xmin, vcoord_t ymin, vcoord_t xmax, vcoord_t ymax)
 {
-	/* Initialize anti-corruption walls */
-	INIT_WALL(wall_before_raster, WALL_SIZE);
-	INIT_WALL(wall_after_raster, WALL_SIZE);
-
-	gfx_InitBitMap(&ChartBitmap, ChartRaster, BM_WIDTH, BM_HEIGHT);
-	gfx_ClearBitMap(&ChartBitmap);
-	gfx_DrawAxis(&ChartBitmap);
-
-	gfx_SetClipRect(&ChartBitmap, CHART_BORDERLEFT, CHART_BORDERTOP,
-		BM_WIDTH - CHART_BORDERRIGHT - 1, BM_HEIGHT - CHART_BORDERBOTTOM - 1);
+	gfx_ClearBitmap(bm);
+	chart_drawAxis(bm);
 
-	gfx_SetViewRect(&ChartBitmap, xmin, ymin, xmax, ymax);
+	gfx_SetClipRect(bm, CHART_BORDERLEFT, CHART_BORDERTOP,
+		bm->width - CHART_BORDERRIGHT - 1, bm->height - CHART_BORDERBOTTOM - 1);
 
-	CHECK_WALL(wall_before_raster, WALL_SIZE);
-	CHECK_WALL(wall_after_raster, WALL_SIZE);
+	gfx_SetViewRect(bm, xmin, ymin, xmax, ymax);
 
-	return &ChartBitmap;
+	//CHECK_WALL(wall_before_raster, WALL_SIZE);
+	//CHECK_WALL(wall_after_raster, WALL_SIZE);
 }
 
 
@@ -92,8 +75,8 @@ void chart_drawAxis(Bitmap *bm)
 	gfx_LineTo(bm, CHART_BORDERLEFT + CHART_WIDTH - 1, CHART_BORDERTOP + CHART_HEIGHT - 1);
 	gfx_LineTo(bm, CHART_BORDERLEFT + CHART_WIDTH - 4, CHART_BORDERTOP + CHART_HEIGHT - 3);
 
-	CHECK_WALL(wall_before_raster, WALL_SIZE);
-	CHECK_WALL(wall_after_raster, WALL_SIZE);
+	//CHECK_WALL(wall_before_raster, WALL_SIZE);
+	//CHECK_WALL(wall_after_raster, WALL_SIZE);
 }
 
 
@@ -102,7 +85,7 @@ void chart_drawAxis(Bitmap *bm)
  * are identified by the \a curve_y array and X-coordinates are
  * are evenly spaced by one virtual unit.
  */
-void chart_drawCurve(Bitmap *bm, const vcoord_t *curve_y, int curve_cnt)
+void chart_drawCurve(Bitmap *bm, const chart_y_t *curve_y, int curve_cnt)
 {
 	int i;
 
@@ -111,8 +94,8 @@ void chart_drawCurve(Bitmap *bm, const vcoord_t *curve_y, int curve_cnt)
 	for (i = 1; i < curve_cnt; i++)
 		gfx_LineTo(bm, gfx_TransformX(bm, i), gfx_TransformY(bm, curve_y[i]));
 
-	CHECK_WALL(wall_before_raster, WALL_SIZE);
-	CHECK_WALL(wall_after_raster, WALL_SIZE);
+	//CHECK_WALL(wall_before_raster, WALL_SIZE);
+	//CHECK_WALL(wall_after_raster, WALL_SIZE);
 }
 
 
@@ -120,27 +103,27 @@ void chart_drawCurve(Bitmap *bm, const vcoord_t *curve_y, int curve_cnt)
  * Disegna dei dot in corrispondenza delle coppie (dotsx[i];dotsy[i])
  * Se dotsx e' NULL, i punti vengono disegnati ad intervalli regolari.
  */
-void chart_drawDots(BitMap *bm, const vcoord_t *dotsx, const vcoord_t *dotsy, int cnt)
+void chart_drawDots(Bitmap *bm, const chart_x_t *dots_x, const chart_y_t *dots_y, int cnt)
 {
 	int i;
 	coord_t x, y;
 
 	for (i = 0; i < cnt; i++)
 	{
-		if (dotsx)
-			x = gfx_TransformX(bm, dotsx[i]);
+		if (dots_x)
+			x = gfx_TransformX(bm, dots_x[i]);
 		else
 			x = gfx_TransformX(bm, i);
 
-		y = gfx_TransformY(bm, dotsy[i]);
+		y = gfx_TransformY(bm, dots_y[i]);
 
 		gfx_DrawRect(bm, x - 1, y - 1, x + 1, y + 1);
 
 		/* Disegna ticks sull'asse X */
-		gfx_DrawLine(bm, x, BM_HEIGHT - 1, x, CHART_HEIGHT - 1);
+		gfx_DrawLine(bm, x, bm->height - 1, x, CHART_HEIGHT - 1);
 	}
 
-	CHECK_WALL(wall_before_raster, WALL_SIZE);
-	CHECK_WALL(wall_after_raster, WALL_SIZE);
+	//CHECK_WALL(wall_before_raster, WALL_SIZE);
+	//CHECK_WALL(wall_after_raster, WALL_SIZE);
 }