===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.13
retrieving revision 1.21
diff -u -p -r1.13 -r1.21
--- OpenXM_contrib2/asir2000/plot/if.c	2002/08/02 09:29:17	1.13
+++ OpenXM_contrib2/asir2000/plot/if.c	2006/11/09 15:54:35	1.21
@@ -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/if.c,v 1.12 2002/08/02 08:59:47 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.20 2006/11/09 03:41:47 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -114,7 +114,7 @@ int plot(NODE arg)
 		can->mode = xrange ? MODE_PLOT : MODE_POLARPLOT;
 
 	if ( zrange ) {
-		n = BDY(zrange); v = VR((P)BDY(n)); n = NEXT(n);
+		n = NEXT(BDY(zrange));
 		can->zmin = ToReal(BDY(n)); 
 		n = NEXT(n); can->zmax = ToReal(BDY(n));
 		n = NEXT(n);
@@ -122,7 +122,7 @@ int plot(NODE arg)
 			can->nzstep = n ? QTOS((Q)BDY(n)) : MAXGC;
 		else {
 			/* XXX */
-			can->vx = v;
+			can->vx = VR((P)BDY(BDY(zrange)));
 			can->nzstep = n ? QTOS((Q)BDY(n)) : DEFAULTPOLARSTEP;
 		}
 	}
@@ -138,54 +138,18 @@ int plot(NODE arg)
 	else
 		can->wname = "";
 	can->formula = formula; 
-	create_canvas(can);
 	if ( can->mode == MODE_PLOT ) {
 		plotcalc(can);
+		create_canvas(can);
 		plot_print(display,can);
 	} else if ( can->mode == MODE_POLARPLOT ) {
 		polarplotcalc(can);
+		create_canvas(can);
 		plot_print(display,can);
-	} else
-		ifplotmain(can);
-	copy_to_canvas(can);
-	return id;
-}
-
-int polarplot(NODE arg)
-{
-	int id;
-	NODE n;
-	struct canvas *can;
-	P formula;
-	LIST xrange,yrange,zrange,wsize;
-	STRING wname;
-
-	formula = (P)ARG0(arg);
-	xrange = (LIST)ARG1(arg);
-	wsize = (LIST)ARG4(arg);
-	wname = (STRING)ARG5(arg);
-
-	can = canvas[id = search_canvas()];
-	n = BDY(xrange); can->vx = VR((P)BDY(n)); n = NEXT(n);
-	/* XXX  use zmin, zmax to hold parameter range */
-	can->zmin = ToReal((Num)BDY(n)); n = NEXT(n);
-	can->zmax = ToReal((Num)BDY(n));
-	can->mode = MODE_POLARPLOT;
-	if ( !wsize ) {
-		can->width = DEFAULTWIDTH; can->height = DEFAULTHEIGHT;
 	} else {
-		can->width = QTOS((Q)BDY(BDY(wsize)));
-		can->height = QTOS((Q)BDY(NEXT(BDY(wsize))));
+		create_canvas(can);
+		ifplotmain(can);
 	}
-	if ( wname )
-		can->wname = BDY(wname);
-	else
-		can->wname = "";
-	can->formula = formula; 
-	polarplotcalc(can);
-	/* xmax, xmin etc are determined after calc */
-	create_canvas(can);
-	plot_print(display,can);
 	copy_to_canvas(can);
 	return id;
 }
@@ -209,6 +173,7 @@ int memory_plot(NODE arg,LIST *bytes)
 	zrange = (LIST)ARG3(arg);
 	wsize = (LIST)ARG4(arg);
 
+	bzero((char *)&tmp_can,sizeof(tmp_can));
 	can = &tmp_can;
 	n = BDY(xrange); can->vx = VR((P)BDY(n)); n = NEXT(n);
 	can->qxmin = (Q)BDY(n); n = NEXT(n); can->qxmax = (Q)BDY(n);
@@ -237,9 +202,13 @@ int memory_plot(NODE arg,LIST *bytes)
 	}
 	can->wname = "";
 	can->formula = formula; 
-	if ( can->mode == MODE_PLOT )
+	if ( can->mode == MODE_PLOT ) {
 		plotcalc(can);
-	else {
+		memory_print(can,&barray);
+		STOQ(can->width,qw); STOQ(can->height,qh);
+		n = mknode(3,qw,qh,barray);
+		MKLIST(*bytes,n);
+	} else {
 		width = can->width; height = can->height;
 		tabe = (double **)ALLOCA(width*sizeof(double *));
 		for ( i = 0; i < width; i++ )
@@ -254,15 +223,15 @@ int memory_plot(NODE arg,LIST *bytes)
 
 int plotover(NODE arg)
 {
-	int index;
+	int index, color;
 	P formula;
 	struct canvas *can;
-	struct canvas fakecan;
 	VL vl,vl0;
 
 	index = QTOS((Q)ARG0(arg));
 	formula = (P)ARG1(arg);
 	can = canvas[index];
+	color = can->color;
 	if ( !can->window )
 		return -1;
 	get_vars_recursive((Obj)formula,&vl);
@@ -270,14 +239,25 @@ int plotover(NODE arg)
 		if ( vl0->v->attr == (pointer)V_IND )
 			if ( vl->v != can->vx && vl->v != can->vy )
 				return -1;
+	if ( argc(arg) == 3 )
+		can->color = QTOS((Q)ARG2(arg));
+	else
+		can->color = 0;
+#if !defined(VISUAL)
+	set_drawcolor(can->color);
+#endif
 	current_can = can;
-	fakecan = *can; fakecan.formula = formula;
+	can->formula = formula;
 	if ( can->mode == MODE_PLOT ) {
-		plotcalc(&fakecan);
-		plot_print(display,&fakecan);
+		plotcalc(can);
+		plot_print(display,can);
 	} else
-		ifplotmain(&fakecan);
-	copy_to_canvas(&fakecan);
+		ifplotmain(can);
+	copy_to_canvas(can);
+	can->color = color;
+#if !defined(VISUAL)
+	set_drawcolor(can->color);
+#endif
 	return index;
 }
 
@@ -290,23 +270,25 @@ int drawcircle(NODE arg)
 	Q ret;
 	LIST xyr;
 	Obj x,y,r;
-	int wx,wy,wr;
+	int wx,wy,wr,c;
 	struct canvas *can;
-	struct canvas fakecan;
 
 	index = QTOS((Q)ARG0(arg));
 	xyr = (LIST)ARG1(arg); 
 	x = (Obj)ARG0(BDY(xyr)); y = (Obj)ARG1(BDY(xyr)); r = (Obj)ARG2(BDY(xyr));
+	c = QTOS((Q)ARG2(arg));
 	can = canvas[index];
 	if ( !can->window )
 		return -1;
 	else {
 		current_can = can;
+		set_drawcolor(c);
 		wx = (ToReal(x)-can->xmin)*can->width/(can->xmax-can->xmin);
 		wy = (can->ymax-ToReal(y))*can->height/(can->ymax-can->ymin);
 		wr = ToReal(r);
-		XFillArc(display,can->pix,colorGC,wx-wr/2,wy-wr/2,wr,wr,0,360*64);
+		XFillArc(display,can->pix,cdrawGC,wx-wr/2,wy-wr/2,wr,wr,0,360*64);
 		copy_to_canvas(can);
+		set_drawcolor(can->color);
 		return index;
 	}
 #endif
@@ -343,23 +325,29 @@ int draw_obj(NODE arg)
 		case 2: /* point */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			draw_point(display,can,x,y,color);
-			MKRVECT2(vect,x,y); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT3(vect,x,y,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		case 3: /* circle */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			r = (int)ToReal((Q)ARG2(obj));
-			MKRVECT3(vect,x,y,r); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT4(vect,x,y,r,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		case 4: /* line */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			u = (int)ToReal((Q)ARG2(obj)); v = (int)ToReal((Q)ARG3(obj));
 			draw_line(display,can,x,y,u,v,color);
-			MKRVECT4(vect,x,y,u,v); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT5(vect,x,y,u,v,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		default:
 			set_lasterror("draw_obj : invalid request");
 			return -1;
 	}
+#if !defined(VISUAL)
+	set_drawcolor(can->color);
+#endif
 	return 0;
 }
 
@@ -393,6 +381,9 @@ int draw_string(NODE arg)
 	x = (int)ToReal((Q)ARG0(pos));
 	y = (int)ToReal((Q)ARG1(pos));
 	draw_character_string(display,can,x,y,str,color);
+#if !defined(VISUAL)
+	set_drawcolor(can->color);
+#endif
 	return 0;
 }