===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.12
retrieving revision 1.17
diff -u -p -r1.12 -r1.17
--- OpenXM_contrib2/asir2000/plot/if.c	2002/08/02 08:59:47	1.12
+++ OpenXM_contrib2/asir2000/plot/if.c	2005/05/18 03:27:00	1.17
@@ -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.11 2002/08/02 02:57:48 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.16 2004/03/26 08:25:37 noro 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,53 +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; 
-	create_canvas(can);
-	polarplotcalc(can);
-	plot_print(display,can);
 	copy_to_canvas(can);
 	return id;
 }
@@ -269,6 +234,11 @@ 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;
+	set_drawcolor(can->color);
 	current_can = can;
 	fakecan = *can; fakecan.formula = formula;
 	if ( can->mode == MODE_PLOT ) {
@@ -342,18 +312,21 @@ 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");