===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.7
retrieving revision 1.17
diff -u -p -r1.7 -r1.17
--- OpenXM_contrib2/asir2000/plot/if.c	2001/10/09 01:36:27	1.7
+++ OpenXM_contrib2/asir2000/plot/if.c	2005/05/18 03:27:00	1.17
@@ -45,14 +45,14 @@
  * 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.6 2001/08/22 09:19:21 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"
 #include "ox.h"
 #include "ifplot.h"
 
-extern jmp_buf ox_env;
+extern JMP_BUF ox_env;
 
 int open_canvas(NODE arg)
 {
@@ -88,6 +88,7 @@ int plot(NODE arg)
 	P formula;
 	LIST xrange,yrange,zrange,wsize;
 	STRING wname;
+	V v;
 
 	formula = (P)ARG0(arg);
 	xrange = (LIST)ARG1(arg);
@@ -97,25 +98,35 @@ int plot(NODE arg)
 	wname = (STRING)ARG5(arg);
 
 	can = canvas[id = search_canvas()];
-	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);
-	can->xmin = ToReal(can->qxmin); can->xmax = ToReal(can->qxmax); 
+	if ( xrange ) {
+		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);
+		can->xmin = ToReal(can->qxmin); can->xmax = ToReal(can->qxmax); 
+	}
 	if ( yrange ) {
 		n = BDY(yrange); can->vy = VR((P)BDY(n)); n = NEXT(n);
 		can->qymin = (Q)BDY(n); n = NEXT(n); can->qymax = (Q)BDY(n);
 		can->ymin = ToReal(can->qymin); can->ymax = ToReal(can->qymax); 
-		if ( zrange ) {
-			n = NEXT(BDY(zrange));
-			can->zmin = ToReal(BDY(n)); n = NEXT(n); can->zmax = ToReal(BDY(n));
-			if ( n = NEXT(n) )
-				can->nzstep = QTOS((Q)BDY(n));
-			else
-				can->nzstep = MAXGC;
-			can->mode = MODE_CONPLOT;
-		} else
-			can->mode = MODE_IFPLOT;
-	} else
-		can->mode = MODE_PLOT;
+	}
+	if ( xrange && yrange )
+		can->mode = zrange ? MODE_CONPLOT : MODE_IFPLOT;
+	else 
+		can->mode = xrange ? MODE_PLOT : MODE_POLARPLOT;
+
+	if ( zrange ) {
+		n = NEXT(BDY(zrange));
+		can->zmin = ToReal(BDY(n)); 
+		n = NEXT(n); can->zmax = ToReal(BDY(n));
+		n = NEXT(n);
+		if ( can->mode == MODE_CONPLOT )
+			can->nzstep = n ? QTOS((Q)BDY(n)) : MAXGC;
+		else {
+			/* XXX */
+			can->vx = VR((P)BDY(BDY(zrange)));
+			can->nzstep = n ? QTOS((Q)BDY(n)) : DEFAULTPOLARSTEP;
+		}
+	}
+
 	if ( !wsize ) {
 		can->width = DEFAULTWIDTH; can->height = DEFAULTHEIGHT;
 	} else {
@@ -127,12 +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
+	} else if ( can->mode == MODE_POLARPLOT ) {
+		polarplotcalc(can);
+		create_canvas(can);
+		plot_print(display,can);
+	} else {
+		create_canvas(can);
 		ifplotmain(can);
+	}
 	copy_to_canvas(can);
 	return id;
 }
@@ -217,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 ) {
@@ -270,7 +292,13 @@ int draw_obj(NODE arg)
 
 	index = QTOS((Q)ARG0(arg));
 	can = canvas[index];
-	if ( !can || !can->window ) {
+	if ( !can && closed_canvas[index] ) {
+		canvas[index] = closed_canvas[index];
+		closed_canvas[index] = 0;
+		can = canvas[index];
+		popup_canvas(index);
+		current_can = can;
+	} else if ( !can || (can && !can->window) ) {
 		set_lasterror("draw_obj : canvas does not exist");
 		return -1;
 	}
@@ -284,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");
@@ -304,6 +335,39 @@ int draw_obj(NODE arg)
 	return 0;
 }
 
+int draw_string(NODE arg)
+{
+	int index,x,y;
+	char *str;
+	NODE pos;
+	struct canvas *can;
+	int color;
+
+	index = QTOS((Q)ARG0(arg));
+	can = canvas[index];
+	if ( !can && closed_canvas[index] ) {
+		canvas[index] = closed_canvas[index];
+		closed_canvas[index] = 0;
+		can = canvas[index];
+		popup_canvas(index);
+		current_can = can;
+	} else if ( !can || (can && !can->window) ) {
+		set_lasterror("draw_obj : canvas does not exist");
+		return -1;
+	}
+
+	pos = BDY((LIST)ARG1(arg));
+	str = BDY((STRING)ARG2(arg));
+	if ( argc(arg) == 4 )
+		color = QTOS((Q)ARG3(arg));
+	else
+		color = 0; /* black */
+	x = (int)ToReal((Q)ARG0(pos));
+	y = (int)ToReal((Q)ARG1(pos));
+	draw_character_string(display,can,x,y,str,color);
+	return 0;
+}
+
 int clear_canvas(NODE arg)
 {
 	int index;
@@ -542,7 +606,7 @@ void qifplotmain(struct canvas *can)
 
 	width = can->width; height = can->height;
 	tabe = (char **)ALLOCA(width*sizeof(char *)+width*height*sizeof(char));
-	bzero(tabe,width*sizeof(char *)+width*height*sizeof(char));
+	bzero((void *)tabe,width*sizeof(char *)+width*height*sizeof(char));
 	for ( i = 0, tabeb = (char *)(tabe+width); i < width; i++ )
 		tabe[i] = tabeb + height*i;
 	define_cursor(can->window,runningcur);