===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotp.c,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -p -r1.3 -r1.7
--- OpenXM_contrib2/asir2000/plot/plotp.c	2000/08/21 08:31:51	1.3
+++ OpenXM_contrib2/asir2000/plot/plotp.c	2000/11/09 02:30:45	1.7
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.2 2000/03/07 01:32:44 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/plotp.c,v 1.6 2000/11/09 01:51:13 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -59,6 +59,10 @@
 #define EXP10(a) pow(10.0,a)
 #endif
 
+#if defined(VISUAL)
+static POINT oldpos;
+#endif
+
 if_print(display,tab,can)
 DISPLAY *display;
 double **tab;
@@ -160,12 +164,90 @@ struct canvas *can;
 {
 	int len,i;
 	POINT *pa;
-	
+
+#if defined(VISUAL)	
+	len = can->pa[0].length;
+	pa = can->pa[0].pos;
+
+	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);
 	XFlush(display);
+#endif
 }
 
+draw_point(display,can,x,y,color)
+DISPLAY *display;
+struct canvas *can;
+int x,y;
+int color;
+{
+#if defined(VISUAL)
+	HDC dc;
+
+	SetPixel(can->pix,x,y,(COLORREF)color);
+	dc = GetDC(can->hwnd);
+	SetPixel(dc,x,y,(COLORREF)color);
+	ReleaseDC(can->hwnd,dc);
+#else
+	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,color)
+DISPLAY *display;
+struct canvas *can;
+int x,y,u,v;
+int color;
+{
+#if defined(VISUAL)
+	HDC dc;
+	HPEN pen,oldpen;
+
+	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
+	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
+}
+
 #define D 5
 
 pline(display,can,d)
@@ -178,24 +260,29 @@ DRAWABLE d;
 	char buf[BUFSIZ];
 	double adjust_scale();
 
-	if ( can->noaxis )
+	/* XXX : should be cleaned up */
+	if ( can->noaxis || (can->mode == MODE_PLOT && !can->pa) )
 		return;
+	if ( can->mode == MODE_INTERACTIVE )
+		return;
 
 	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);
@@ -203,8 +290,10 @@ 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);
@@ -212,9 +301,17 @@ DRAWABLE d;
 		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));
 	}
 }
 
@@ -238,15 +335,28 @@ initmarker(can,message)
 struct canvas *can;
 char *message;
 {
+#if defined(VISUAL)
+	can->real_can->percentage = 0;
+	can->real_can->prefix = message;
+#else
 	XawScrollbarSetThumb(can->xdone,0.0,0.0);
 	XawScrollbarSetThumb(can->ydone,1.0,0.0);
 	XFlush(display);
+#endif
 }
 
 marker(can,dir,p)
 struct canvas *can;
 int dir,p;
 {
+#if defined(VISUAL)
+	if ( dir == DIR_X )
+		can->real_can->percentage = ceil((float)p/(float)can->real_can->width*100);
+	else if ( dir == DIR_Y )
+		can->real_can->percentage = ceil((float)p/(float)can->real_can->height*100);
+	else
+		can->real_can->percentage = ceil((float)p/(float)can->real_can->nzstep*100);
+#else
 	if ( dir == DIR_X ) {
 		XawScrollbarSetThumb(can->xdone,(float)p/(float)can->width,0.05);
 		count_and_flush();
@@ -257,13 +367,16 @@ int dir,p;
 		XawScrollbarSetThumb(can->ydone,1.0-(float)p/(float)can->nzstep,0.05);
 		flush();
 	}
+#endif
 }
 
 define_cursor(w,cur)
 WINDOW w;
 CURSOR cur;
 {
+#if !defined(VISUAL)
 	XDefineCursor(display,w,cur); flush();
+#endif
 }
 
 static int flush_count;
@@ -274,11 +387,15 @@ static int flush_count;
 #endif
 
 count_and_flush() {
+#if !defined(VISUAL)
 	if ( ++flush_count == MAX_COUNT )
 		flush();
+#endif
 }
 
 flush() {
+#if !defined(VISUAL)
 	flush_count = 0;
 	XFlush(display);
+#endif
 }