===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v
retrieving revision 1.4
retrieving revision 1.10
diff -u -p -r1.4 -r1.10
--- OpenXM_contrib2/asir2000/plot/plotf.c	2000/08/21 08:31:51	1.4
+++ OpenXM_contrib2/asir2000/plot/plotf.c	2001/08/22 09:19:21	1.10
@@ -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/plotf.c,v 1.3 2000/03/31 01:57:14 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.9 2001/06/04 02:49:49 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,13 +53,19 @@
 #include "ifplot.h"
 
 void Pifplot(), Pconplot(), Pplotover(), Pplot(), Parrayplot(), Pdrawcircle();
+void Pmemory_ifplot();
+void Popen_canvas(), Pclear_canvas(), Pdraw_obj();
 
 struct ftab plot_tab[] = {
 	{"ifplot",Pifplot,-7},
+	{"memory_ifplot",Pmemory_ifplot,-7},
 	{"conplot",Pconplot,-8},
 	{"plot",Pplot,-6},
 	{"plotover",Pplotover,3},
 	{"drawcircle",Pdrawcircle,5},
+	{"open_canvas",Popen_canvas,-3},
+	{"clear_canvas",Pclear_canvas,2},
+	{"draw_obj",Pdraw_obj,-4},
 /*
 	{"arrayplot",Parrayplot,2},
 */
@@ -68,11 +74,57 @@ struct ftab plot_tab[] = {
 
 int current_s;
 
+void Popen_canvas(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	Q w300,s_id;
+	LIST geom;
+	int stream,id,i;
+	NODE n,n0;
+	STRING fname,wname;
+
+	geom = 0; wname = 0; stream = -1;
+	for ( ; arg; arg = NEXT(arg) )
+		if ( !BDY(arg) )
+			stream = 0;
+		else
+		switch ( OID(BDY(arg)) ) {
+			case O_LIST:
+				geom = (LIST)BDY(arg);
+				break;
+			case O_N:
+				stream = QTOS((Q)BDY(arg)); break;
+			case O_STR:
+				wname = (STRING)BDY(arg); break;
+			default:
+				error("open_canvas : invalid argument"); break;
+		}
+	/* open_canvas in ox_plot requires 
+	   [s_id (Q),
+	   	geom=[xsize,ysize] (LIST),
+	   	wname=name (STRING)]
+	*/
+
+	if ( stream < 0 )
+		stream = current_s;
+	else
+		current_s = stream;
+	STOQ(stream,s_id);
+	if ( !geom ) {
+		STOQ(300,w300);
+		MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n);
+	}
+	MKSTR(fname,"open_canvas");
+	arg = mknode(4,s_id,fname,geom,wname);
+	Pox_cmo_rpc(arg,rp);
+}
+
 void Pifplot(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Q m2,p2,w300,sid;
+	Q m2,p2,w300,s_id;
 	NODE defrange;
 	LIST xrange,yrange,range[2],list,geom;
 	VL vl,vl0;
@@ -153,7 +205,7 @@ Obj *rp;
 			error("ifplot : cannot happen"); break;
 	}
 	/* ifplot in ox_plot requires 
-	   [sid (Q),
+	   [s_id (Q),
 	   	formula (Obj),
 	   	xrange=[x,xmin,xmax] (LIST),
 	   	yrange=[y,ymin,ymax] (LIST),
@@ -166,21 +218,126 @@ Obj *rp;
 		stream = current_s;
 	else
 		current_s = stream;
-	STOQ(stream,sid);
+	STOQ(stream,s_id);
 	if ( !geom ) {
 		STOQ(300,w300);
 		MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n);
 	}
 	MKSTR(fname,"plot");
-	arg = mknode(8,sid,fname,poly,xrange,yrange,0,geom,wname);
+	arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname);
 	Pox_rpc(arg,rp);
 }
 
+void Pmemory_ifplot(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	Q m2,p2,w300,s_id;
+	NODE defrange;
+	LIST xrange,yrange,range[2],list,geom;
+	VL vl,vl0;
+	V v[2],av[2];
+	int stream,ri,id,i;
+	P poly;
+	P var;
+	NODE n,n0;
+	STRING fname,wname;
+
+	STOQ(-2,m2); STOQ(2,p2);
+	MKNODE(n,p2,0); MKNODE(defrange,m2,n); 
+	poly = 0; vl = 0; geom = 0; stream = -1; ri = 0;
+	for ( ; arg; arg = NEXT(arg) )
+		if ( !BDY(arg) )
+			stream = 0;
+		else
+		switch ( OID(BDY(arg)) ) {
+			case O_P:
+				poly = (P)BDY(arg); 
+				get_vars_recursive(poly,&vl);
+				for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) )
+					if ( vl0->v->attr == V_IND )
+						if ( i >= 2 )
+							error("ifplot : invalid argument");
+						else
+							v[i++] = vl0->v;
+				break;
+			case O_LIST:
+				list = (LIST)BDY(arg);
+				if ( OID(BDY(BDY(list))) == O_P )
+					if ( ri > 1 )
+						error("ifplot : invalid argument");
+					else
+						range[ri++] = list;
+				else
+					geom = list;
+				break;
+			case O_N:
+				stream = QTOS((Q)BDY(arg)); break;
+			default:
+				error("memory_ifplot : invalid argument"); break;
+		}
+	if ( !poly )
+		error("memory_ifplot : invalid argument");
+	switch ( ri ) {
+		case 0:
+			if ( !v[1] )
+				error("memory_ifplot : please specify all variables");
+			MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n);
+			MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n);
+			break;
+		case 1:
+			if ( !v[1] )
+				error("memory_ifplot : please specify all variables");
+			av[0] = VR((P)BDY(BDY(range[0])));
+			if ( v[0] == av[0] ) {
+				xrange = range[0];
+				MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n);
+			} else if ( v[1] == av[0] ) {
+				MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n);
+				yrange = range[0];
+			} else
+				error("memory_ifplot : invalid argument");
+			break;
+		case 2:
+			av[0] = VR((P)BDY(BDY(range[0])));
+			av[1] = VR((P)BDY(BDY(range[1])));
+			if ( ((v[0] == av[0]) && (!v[1] || v[1] == av[1])) ||
+				 ((v[0] == av[1]) && (!v[1] || v[1] == av[0])) ) {
+					xrange = range[0]; yrange = range[1];
+			} else
+					error("memory_ifplot : invalid argument");
+			break;
+		default:
+			error("memory_ifplot : cannot happen"); break;
+	}
+	/* memory_ifplot in ox_plot requires 
+	   [s_id (Q),
+	   	formula (Obj),
+	   	xrange=[x,xmin,xmax] (LIST),
+	   	yrange=[y,ymin,ymax] (LIST),
+	   	zrange=0,
+	   	geom=[xsize,ysize] (LIST)]
+	*/
+
+	if ( stream < 0 )
+		stream = current_s;
+	else
+		current_s = stream;
+	STOQ(stream,s_id);
+	if ( !geom ) {
+		STOQ(300,w300);
+		MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n);
+	}
+	MKSTR(fname,"memory_plot");
+	arg = mknode(7,s_id,fname,poly,xrange,yrange,0,geom);
+	Pox_rpc(arg,rp);
+}
+
 void Pconplot(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Q m2,p2,w300,sid;
+	Q m2,p2,w300,s_id;
 	NODE defrange;
 	LIST xrange,yrange,zrange,range[3],list,geom;
 	VL vl,vl0;
@@ -277,7 +434,7 @@ Obj *rp;
 		current_s = stream;
 
 	/* conplot in ox_plot requires 
-	   [sid (Q),
+	   [s_id (Q),
 	   	formula (Obj),
 	   	xrange=[x,xmin,xmax] (LIST),
 	   	yrange=[y,ymin,ymax] (LIST),
@@ -290,13 +447,13 @@ Obj *rp;
 		stream = current_s;
 	else
 		current_s = stream;
-	STOQ(stream,sid);
+	STOQ(stream,s_id);
 	if ( !geom ) {
 		STOQ(300,w300);
 		MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n);
 	}
 	MKSTR(fname,"plot");
-	arg = mknode(8,sid,fname,poly,xrange,yrange,zrange,geom,wname);
+	arg = mknode(8,s_id,fname,poly,xrange,yrange,zrange,geom,wname);
 	Pox_rpc(arg,rp);
 }
 
@@ -304,7 +461,7 @@ void Pplot(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Q m2,p2,w300,sid;
+	Q m2,p2,w300,s_id;
 	NODE defrange;
 	LIST xrange,range[1],list,geom;
 	VL vl,vl0;
@@ -332,6 +489,8 @@ Obj *rp;
 							error("ifplot : invalid argument");
 						else
 							v[i++] = vl0->v;
+				if ( i != 1 )
+					error("ifplot : invalid argument");
 				break;
 			case O_LIST:
 				list = (LIST)BDY(arg);
@@ -367,7 +526,7 @@ Obj *rp;
 			error("plot : cannot happen"); break;
 	}
 	/* conplot in ox_plot requires 
-	   [sid (Q),
+	   [s_id (Q),
 	   	formula (Obj),
 	   	xrange=[x,xmin,xmax] (LIST),
 	   	yrange=0,
@@ -379,13 +538,13 @@ Obj *rp;
 		stream = current_s;
 	else
 		current_s = stream;
-	STOQ(stream,sid);
+	STOQ(stream,s_id);
 	if ( !geom ) {
 		STOQ(300,w300);
 		MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n);
 	}
 	MKSTR(fname,"plot");
-	arg = mknode(8,sid,fname,poly,xrange,0,0,geom,wname);
+	arg = mknode(8,s_id,fname,poly,xrange,0,0,geom,wname);
 	Pox_rpc(arg,rp);
 }
 
@@ -393,25 +552,25 @@ void Pplotover(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Q sid,index;
+	Q s_id,index;
 	P poly;
 	STRING fname;
 
 	poly = (P)ARG0(arg);
-	sid = (Q)ARG1(arg);
+	s_id = (Q)ARG1(arg);
 	index = (Q)ARG2(arg);
 	MKSTR(fname,"plotover");
-	arg = mknode(4,sid,fname,index,poly);
+	arg = mknode(4,s_id,fname,index,poly);
 	Pox_rpc(arg,rp);
 }
 
-/* arg = [x,y,r,sid,index] */
+/* arg = [x,y,r,s_id,index] */
 
 void Pdrawcircle(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Q sid,index;
+	Q s_id,index;
 	Obj x,y,r;
 	STRING fname;
 	NODE n;
@@ -420,12 +579,52 @@ Obj *rp;
 	x = (Obj)ARG0(arg);
 	y = (Obj)ARG1(arg);
 	r = (Obj)ARG2(arg);
-	sid = (Q)ARG3(arg);
+	s_id = (Q)ARG3(arg);
 	index = (Q)ARG4(arg);
 	MKSTR(fname,"drawcircle");
 	n = mknode(3,x,y,r); MKLIST(pos,n);
-	arg = mknode(4,sid,fname,index,pos);
+	arg = mknode(4,s_id,fname,index,pos);
 	Pox_rpc(arg,rp);
+}
+
+/* draw_obj(s_id,cindex,point|line); point = [x,y], line = [xa,ya,xb,yb] */
+void Pdraw_obj(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	static STRING fname;
+	Q s_id,index;
+	LIST obj;
+
+	if ( !fname ) {
+		MKSTR(fname,"draw_obj");
+	}
+	s_id = (Q)ARG0(arg);
+	index = (Q)ARG1(arg);
+	obj = (LIST)ARG2(arg);
+	/* ARG3(arg) = color */
+	if ( argc(arg) == 4 )
+		arg = mknode(5,s_id,fname,index,obj,ARG3(arg));
+	else
+		arg = mknode(4,s_id,fname,index,obj);
+	Pox_cmo_rpc(arg,rp);
+}
+
+void Pclear_canvas(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	static STRING fname;
+	Q s_id,index;
+	LIST obj;
+
+	if ( !fname ) {
+		MKSTR(fname,"clear_canvas");
+	}
+	s_id = (Q)ARG0(arg);
+	index = (Q)ARG1(arg);
+	arg = mknode(3,s_id,fname,index);
+	Pox_cmo_rpc(arg,rp);
 }
 
 #if 0