===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotp.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM_contrib2/asir2000/plot/plotp.c	2000/11/07 06:06:40	1.5
+++ OpenXM_contrib2/asir2000/plot/plotp.c	2001/08/22 09:19:21	1.8
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/plotp.c,v 1.4 2000/08/22 05:04:33 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/plotp.c,v 1.7 2000/11/09 02:30:45 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -88,6 +88,36 @@ struct canvas *can;
 	flush();
 }
 
+#define MEMORY_DRAWPOINT(a,len,x,y) (((a)[(len)*(y)+((x)>>3)]) |= (1<<((x)&7)))
+
+memory_if_print(tab,can,bytes)
+double **tab;
+struct canvas *can;
+BYTEARRAY *bytes;
+{
+	int ix,iy,width,height;
+	double *px,*px1,*px2;
+	unsigned char *array;
+	int scan_len;
+
+	if ( can->mode == MODE_CONPLOT ) {
+		memory_con_print(tab,can,bytes); return;
+	}
+	width = can->width; height = can->height;
+
+	/* scan_len = byte length of the scan line */
+	scan_len = (width+7)/8;
+	MKBYTEARRAY(*bytes,scan_len*height);
+	array = BDY(*bytes);
+	for( ix=0; ix<width-1; ix++ )
+		for(iy=0, px=tab[ix], px1 = tab[ix+1], px2 = px+1;
+			iy<height-1 ;iy++, px++, px1++, px2++ )
+			if ( ((*px >= 0) && ((*px1 <= 0) || (*px2 <= 0))) ||
+				 ((*px <= 0) && ((*px1 >= 0) || (*px2 >= 0))) ) {
+				MEMORY_DRAWPOINT(array,scan_len,ix,height-iy-1);
+			}
+}
+
 con_print(display,tab,can)
 DISPLAY *display;
 double **tab;
@@ -138,6 +168,55 @@ struct canvas *can;
 	flush();
 }
 
+memory_con_print(tab,can,bytes)
+double **tab;
+struct canvas *can;
+BYTEARRAY *bytes;
+{
+	int ix,iy,iz,width,height,pas,pai,len;
+	double zstep,z;
+	double *px,*px1,*px2;
+	POINT *pa,*pa1;
+	struct pa *parray;
+	unsigned char *array;
+	int scan_len;
+
+	width = can->width; height = can->height;
+	zstep = (can->zmax-can->zmin)/can->nzstep;
+	can->pa = (struct pa *)MALLOC((can->nzstep+1)*sizeof(struct pa));
+	pas = width;
+	pa = (POINT *)ALLOCA(pas*sizeof(POINT));
+	for ( z = can->zmin, iz = 0; z <= can->zmax; z += zstep, iz++ ) {
+		pai = 0;	
+		for( ix=0; ix<width-1; ix++ )
+			for(iy=0, px=tab[ix], px1 = tab[ix+1], px2 = px+1;
+				iy<height-1 ;iy++, px++, px1++, px2++ )
+				if ( ((*px >= z) && ((*px1 <= z) || (*px2 <= z))) ||
+				 	 ((*px <= z) && ((*px1 >= z) || (*px2 >= z))) ) {
+					if ( pai == pas ) {
+						pa1 = (POINT *)ALLOCA(2*pas*sizeof(POINT));
+						bcopy((char *)pa,(char *)pa1,pas*sizeof(POINT)); pa = pa1;
+						pas += pas;
+					}
+					XC(pa[pai]) = ix; YC(pa[pai]) = height-iy-1; pai++;
+				}
+		can->pa[iz].length = pai;
+		if ( pai ) {
+			pa1 = (POINT *)MALLOC(pai*sizeof(POINT));
+			bcopy((char *)pa,(char *)pa1,pai*sizeof(POINT));
+			can->pa[iz].pos = pa1;
+		}
+	}
+	/* scan_len = byte length of the scan line */
+	scan_len = (width+7)/8;
+	MKBYTEARRAY(*bytes,scan_len*height);
+	array = BDY(*bytes);
+	for ( parray = can->pa, iz = 0; iz <= can->nzstep; iz++, parray++ )
+		for ( pa = parray->pos, len = parray->length, ix = 0; ix < len; ix++ ) {
+			MEMORY_DRAWPOINT(array,scan_len,XC(pa[ix]),YC(pa[ix]));
+		}
+}
+
 qif_print(display,tab,can)
 DISPLAY *display;
 char **tab;
@@ -168,9 +247,11 @@ struct canvas *can;
 #if defined(VISUAL)	
 	len = can->pa[0].length;
 	pa = can->pa[0].pos;
-	for ( i = 0; i < len-1; i++ ) {
-		DRAWLINE(display,can->pix,drawGC,pa[i].x,pa[i].y,pa[i+1].x,pa[i+1].y);
-	}
+
+	Polyline(can->pix,pa,len);
+//	for ( i = 0; i < len-1; i++ ) {
+//		DRAWLINE(display,can->pix,drawGC,pa[i].x,pa[i].y,pa[i+1].x,pa[i+1].y);
+//	}
 #else
 	XDrawLines(display,can->pix,drawGC,
 		can->pa[0].pos,can->pa[0].length,CoordModeOrigin);
@@ -178,46 +259,70 @@ struct canvas *can;
 #endif
 }
 
-draw_point(display,can,x,y)
+draw_point(display,can,x,y,color)
 DISPLAY *display;
 struct canvas *can;
 int x,y;
+int color;
 {
 #if defined(VISUAL)
 	HDC dc;
 
-	y = can->height-y;
-	DRAWPOINT(display,can->pix,drawGC,x,y);
+	SetPixel(can->pix,x,y,(COLORREF)color);
 	dc = GetDC(can->hwnd);
-	DRAWPOINT(display,dc,drawGC,x,y);
+	SetPixel(dc,x,y,(COLORREF)color);
 	ReleaseDC(can->hwnd,dc);
 #else
-	y = can->height-y;
-	DRAWPOINT(display,can->pix,drawGC,x,y);
-	DRAWPOINT(display,can->window,drawGC,x,y);
+	if ( color ) {
+		set_drawcolor(color);
+		DRAWPOINT(display,can->pix,cdrawGC,x,y);
+		DRAWPOINT(display,can->window,cdrawGC,x,y);
+	} else {
+		DRAWPOINT(display,can->pix,drawGC,x,y);
+		DRAWPOINT(display,can->window,drawGC,x,y);
+	}
 	XFlush(display);
 #endif
 }
 
-draw_line(display,can,x,y,u,v)
+draw_line(display,can,x,y,u,v,color)
 DISPLAY *display;
 struct canvas *can;
 int x,y,u,v;
+int color;
 {
 #if defined(VISUAL)
 	HDC dc;
+	HPEN pen,oldpen;
 
-	y = can->height-y;
-	v = can->height-v;
-	DRAWLINE(display,can->pix,drawGC,x,y,u,v);
-	dc = GetDC(can->hwnd);
-	DRAWLINE(display,dc,drawGC,x,y,u,v);
-	ReleaseDC(can->hwnd,dc);
+	if ( color ) {
+		pen = CreatePen(PS_SOLID,1,color);
+		oldpen = SelectObject(can->pix,pen);
+		DRAWLINE(display,can->pix,drawGC,x,y,u,v);
+		SelectObject(can->pix,oldpen);
+
+		dc = GetDC(can->hwnd);
+		oldpen = SelectObject(dc,pen);
+		DRAWLINE(display,dc,drawGC,x,y,u,v);
+		SelectObject(dc,oldpen);
+		ReleaseDC(can->hwnd,dc);
+
+		DeleteObject(pen);
+	} else {
+		DRAWLINE(display,can->pix,drawGC,x,y,u,v);
+		dc = GetDC(can->hwnd);
+		DRAWLINE(display,dc,drawGC,x,y,u,v);
+		ReleaseDC(can->hwnd,dc);
+	}
 #else
-	y = can->height-y;
-	v = can->height-v;
-	DRAWLINE(display,can->pix,drawGC,x,y,u,v);
-	DRAWLINE(display,can->window,drawGC,x,y,u,v);
+	if ( color ) {
+		set_drawcolor(color);
+		DRAWLINE(display,can->pix,cdrawGC,x,y,u,v);
+		DRAWLINE(display,can->window,cdrawGC,x,y,u,v);
+	} else {
+		DRAWLINE(display,can->pix,drawGC,x,y,u,v);
+		DRAWLINE(display,can->window,drawGC,x,y,u,v);
+	}
 	XFlush(display);
 #endif
 }
@@ -242,19 +347,21 @@ DRAWABLE d;
 
 	xadj = yadj = 0;
 	if ( (can->xmin < 0) && (can->xmax > 0) ) {
-		x0 = (int)((can->width-1)*(-can->xmin/(can->xmax-can->xmin)));
+		x0 = (int)((can->width)*(-can->xmin/(can->xmax-can->xmin)));
 		DRAWLINE(display,d,dashGC,x0,0,x0,can->height);
 	} else if ( can->xmin >= 0 )
 		x0 = 0;
 	else
-		x0 = can->width-1-D;
+		x0 = can->width-D;
 	if ( (can->ymin < 0) && (can->ymax > 0) ) {
-		y0 = (int)((can->height-1)*(can->ymax/(can->ymax-can->ymin)));
+		y0 = (int)((can->height)*(can->ymax/(can->ymax-can->ymin)));
 		DRAWLINE(display,d,dashGC,0,y0,can->width,y0);
 	} else if ( can->ymin >= 0 )
-		y0 = can->height-1;
+		y0 = can->height;
 	else
 		y0 = D;
+
+	/* scale on x-axis */
 	w = can->xmax-can->xmin; 
 	w1 = w * DEFAULTWIDTH/can->width;
 	e = adjust_scale(EXP10(floor(log10(w1))),w1);
@@ -262,20 +369,28 @@ DRAWABLE d;
 		x = (int)can->width*(n*e-can->xmin)/w;
 		DRAWLINE(display,d,drawGC,x,y0,x,y0-D);
 		sprintf(buf,"%g",n*e);
-		DRAWSTRING(display,d,scaleGC,x+2,y0,buf,strlen(buf));
+		DRAWSTRING(display,d,scaleGC,x+2,y0+2,buf,strlen(buf));
 	}
+
+	/* scale on y-axis */
 	w = can->ymax-can->ymin;
 	w1 = w * DEFAULTHEIGHT/can->height;
 	e = adjust_scale(EXP10(floor(log10(w1))),w1);
-	if ( w == 0 )
-		printf("afo");
 	for ( n = ceil(can->ymin/e); n*e<= can->ymax; n++ ) {
 		y = (int)can->height*(1-(n*e-can->ymin)/w);
 		DRAWLINE(display,d,drawGC,x0,y,x0+D,y);
 		sprintf(buf,"%g",n*e);
-		if ( can->xmax <= 0 )
+		if ( can->xmax <= 0 ) {
+#if !defined(VISUAL)
 			xadj = TEXTWIDTH(sffs,buf,strlen(buf));
-		DRAWSTRING(display,d,scaleGC,x0-xadj,y,buf,strlen(buf));
+#else
+			SIZE size;
+
+			GetTextExtentPoint32(d,buf,strlen(buf),&size);
+			xadj = size.cx;
+#endif
+		}
+		DRAWSTRING(display,d,scaleGC,x0+2-xadj,y+2,buf,strlen(buf));
 	}
 }