===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v
retrieving revision 1.2
retrieving revision 1.9
diff -u -p -r1.2 -r1.9
--- OpenXM_contrib2/asir2000/plot/plotf.c	2000/03/28 06:32:23	1.2
+++ OpenXM_contrib2/asir2000/plot/plotf.c	2001/06/04 02:49:49	1.9
@@ -1,10 +1,59 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.1.1.1 1999/12/03 07:39:13 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * 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@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * 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.8 2000/11/22 04:03:11 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
 #include "ifplot.h"
 
 void Pifplot(), Pconplot(), Pplotover(), Pplot(), Parrayplot(), Pdrawcircle();
+void Popen_canvas(), Pclear_canvas(), Pdraw_obj();
 
 struct ftab plot_tab[] = {
 	{"ifplot",Pifplot,-7},
@@ -12,6 +61,9 @@ struct ftab plot_tab[] = {
 	{"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},
 */
@@ -20,11 +72,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;
@@ -105,7 +203,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),
@@ -118,21 +216,21 @@ 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);
-	Pox_cmo_rpc(arg,rp);
+	arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname);
+	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;
@@ -229,7 +327,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),
@@ -242,21 +340,21 @@ 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);
-	Pox_cmo_rpc(arg,rp);
+	arg = mknode(8,s_id,fname,poly,xrange,yrange,zrange,geom,wname);
+	Pox_rpc(arg,rp);
 }
 
 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;
@@ -284,6 +382,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);
@@ -319,7 +419,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,
@@ -331,39 +431,39 @@ 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);
-	Pox_cmo_rpc(arg,rp);
+	arg = mknode(8,s_id,fname,poly,xrange,0,0,geom,wname);
+	Pox_rpc(arg,rp);
 }
 
 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);
-	Pox_cmo_rpc(arg,rp);
+	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;
@@ -372,11 +472,51 @@ 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);
 }