===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.4
retrieving revision 1.15
diff -u -p -r1.4 -r1.15
--- OpenXM_contrib2/asir2000/plot/if.c	2000/11/07 06:06:40	1.4
+++ OpenXM_contrib2/asir2000/plot/if.c	2002/08/15 05:36:10	1.15
@@ -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.3 2000/08/22 05:04:31 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.14 2002/08/02 09:44: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,6 +98,82 @@ int plot(NODE arg)
 	wname = (STRING)ARG5(arg);
 
 	can = canvas[id = search_canvas()];
+	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 ( 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 {
+		can->width = QTOS((Q)BDY(BDY(wsize)));
+		can->height = QTOS((Q)BDY(NEXT(BDY(wsize))));
+	}
+	if ( wname )
+		can->wname = BDY(wname);
+	else
+		can->wname = "";
+	can->formula = formula; 
+	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 {
+		create_canvas(can);
+		ifplotmain(can);
+	}
+	copy_to_canvas(can);
+	return id;
+}
+
+int memory_plot(NODE arg,LIST *bytes)
+{
+	NODE n;
+	struct canvas tmp_can;
+	struct canvas *can;
+	P formula;
+	LIST xrange,yrange,zrange,wsize;
+	int width,height;
+	double **tabe;
+	int i;
+	BYTEARRAY barray;
+	Q qw,qh;
+
+	formula = (P)ARG0(arg);
+	xrange = (LIST)ARG1(arg);
+	yrange = (LIST)ARG2(arg);
+	zrange = (LIST)ARG3(arg);
+	wsize = (LIST)ARG4(arg);
+
+	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);
 	can->xmin = ToReal(can->qxmin); can->xmax = ToReal(can->qxmax); 
@@ -122,19 +199,21 @@ int plot(NODE arg)
 		can->width = QTOS((Q)BDY(BDY(wsize)));
 		can->height = QTOS((Q)BDY(NEXT(BDY(wsize))));
 	}
-	if ( wname )
-		can->wname = BDY(wname);
-	else
-		can->wname = "";
+	can->wname = "";
 	can->formula = formula; 
-	create_canvas(can);
-	if ( can->mode == MODE_PLOT ) {
+	if ( can->mode == MODE_PLOT )
 		plotcalc(can);
-		plot_print(display,can);
-	} else
-		ifplotmain(can);
-	copy_to_canvas(can);
-	return id;
+	else {
+		width = can->width; height = can->height;
+		tabe = (double **)ALLOCA(width*sizeof(double *));
+		for ( i = 0; i < width; i++ )
+			tabe[i] = (double *)ALLOCA(height*sizeof(double));
+		calc(tabe,can,1);
+		memory_if_print(tabe,can,&barray);
+		STOQ(width,qw); STOQ(height,qh);
+		n = mknode(3,qw,qh,barray);
+		MKLIST(*bytes,n);
+	}
 }
 
 int plotover(NODE arg)
@@ -150,9 +229,9 @@ int plotover(NODE arg)
 	can = canvas[index];
 	if ( !can->window )
 		return -1;
-	get_vars_recursive(formula,&vl);
+	get_vars_recursive((Obj)formula,&vl);
 	for ( vl0 = vl; vl0; vl0 = NEXT(vl0) )
-		if ( vl0->v->attr == V_IND )
+		if ( vl0->v->attr == (pointer)V_IND )
 			if ( vl->v != can->vx && vl->v != can->vy )
 				return -1;
 	current_can = can;
@@ -200,41 +279,87 @@ int drawcircle(NODE arg)
 int draw_obj(NODE arg)
 {
 	int index;
-	int x,y,u,v,r,l;
+	int x,y,u,v,len,r;
 	NODE obj,n;
 	RealVect *vect;
 	struct canvas *can;
+	int color;
 
 	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;
+	}
 
 	obj = BDY((LIST)ARG1(arg));
-	switch ( l = length(obj) ) {
+	if ( argc(arg) == 3 )
+		color = QTOS((Q)ARG2(arg));
+	else
+		color = 0; /* black */
+	switch ( len = length(obj) ) {
 		case 2: /* point */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
-			draw_point(display,can,x,y);
-			MKRVECT2(vect,x,y);
-			MKNODE(n,vect,can->history);
-			can->history = n;
+			draw_point(display,can,x,y,color);
+			MKRVECT2(vect,x,y); 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));
-//			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;
+			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);
+			draw_line(display,can,x,y,u,v,color);
 			MKRVECT4(vect,x,y,u,v); MKNODE(n,vect,can->history); can->history = n;
 			break;
 		default:
+			set_lasterror("draw_obj : invalid request");
 			return -1;
 	}
 	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;
@@ -259,7 +384,6 @@ int arrayplot(NODE arg)
 	LIST xrange,wsize;
 	char *wname;
 	NODE n;
-	Q ret;
 	double ymax,ymin,dy,xstep;
 	Real *tab;
 	struct canvas *can;
@@ -311,16 +435,14 @@ int arrayplot(NODE arg)
 		else if ( t < -MAXSHORT )
 			pa[ix].y = -MAXSHORT;
 		else
-			pa[ix].y = t;
+			pa[ix].y = (long)t;
 	}
 	plot_print(display,can);
 	copy_to_canvas(can);
 	return id;
 }
 
-ifplot_resize(can,spos,epos)
-struct canvas *can;
-POINT spos,epos;
+void ifplot_resize(struct canvas *can,POINT spos,POINT epos)
 {
 	struct canvas *ncan;
 	struct canvas fakecan;
@@ -329,7 +451,6 @@ POINT spos,epos;
 	Q s,t;
 	int new;
 	int w,h,m;
-	Q ret;
 
 	if ( XC(spos) < XC(epos) && YC(spos) < YC(epos) ) {
 		if ( can->precise && !can->wide ) {
@@ -395,15 +516,12 @@ POINT spos,epos;
 	}
 }
 
-plot_resize(can,spos,epos)
-struct canvas *can;
-POINT spos,epos;
+void plot_resize(struct canvas *can,POINT spos,POINT epos)
 {
 	struct canvas *ncan;
 	Q dx,dx2,xmin,xmax,xmid;
-	double dy,dy2,ymin,ymax,ymid;
+	double dy,ymin,ymax,ymid;
 	Q sx,ex,cw,ten,two;
-	double sy,ey;
 	Q s,t;
 	int new;
 	int w,h,m;
@@ -455,11 +573,10 @@ POINT spos,epos;
 	}
 }
 
-ifplotmain(can)
-struct canvas *can;
+void ifplotmain(struct canvas *can)
 {
 	int width,height;
-	double **tabe,*tabeb;
+	double **tabe;
 	int i;
 
 	width = can->width; height = can->height;
@@ -468,13 +585,12 @@ struct canvas *can;
 		tabe[i] = (double *)ALLOCA(height*sizeof(double));
 	define_cursor(can->window,runningcur);
 	set_busy(can); set_selection();
-	calc(tabe,can); if_print(display,tabe,can);
+	calc(tabe,can,0); if_print(display,tabe,can);
 	reset_selection(); reset_busy(can);
 	define_cursor(can->window,normalcur);
 }
 
-qifplotmain(can)
-struct canvas *can;
+void qifplotmain(struct canvas *can)
 {
 	int width,height;
 	char **tabe,*tabeb;
@@ -482,7 +598,7 @@ 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);