===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v
retrieving revision 1.18
retrieving revision 1.21
diff -u -p -r1.18 -r1.21
--- OpenXM_contrib2/asir2000/plot/plotf.c	2005/12/21 23:18:16	1.18
+++ OpenXM_contrib2/asir2000/plot/plotf.c	2011/06/16 08:17:15	1.21
@@ -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.17 2005/05/18 03:27:00 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.20 2006/11/15 01:28:44 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -68,7 +68,7 @@ struct ftab plot_tab[] = {
 	{"memory_plot",Pmemory_plot,-5},
 	{"polarplot",Ppolarplot,-6},
 	{"plotover",Pplotover,-4},
-	{"drawcircle",Pdrawcircle,5},
+	{"drawcircle",Pdrawcircle,6},
 	{"open_canvas",Popen_canvas,-3},
 	{"clear_canvas",Pclear_canvas,2},
 	{"draw_obj",Pdraw_obj,-4},
@@ -235,13 +235,13 @@ void ifplot_main(NODE arg,int is_memory, Obj *rp)
 	}
 	if ( is_memory ) {
 		MKSTR(fname,"memory_plot");
-		arg = mknode(7,s_id,fname,poly,xrange,yrange,0,geom);
+		arg = mknode(7,s_id,fname,poly,xrange,yrange,NULLP,geom);
 		Pox_rpc(arg,&t);
 		arg = mknode(1,s_id);
 		Pox_pop_cmo(arg,rp);
 	} else {
 		MKSTR(fname,"plot");
-		arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname);
+		arg = mknode(8,s_id,fname,poly,xrange,yrange,NULLP,geom,wname);
 		Pox_rpc(arg,&t);
 		*rp = (Obj)s_id;
 	}
@@ -481,13 +481,13 @@ void plot_main(NODE arg,int is_memory,Obj *rp)
 	}
 	if ( is_memory ) {
 		MKSTR(fname,"memory_plot");
-		arg = mknode(7,s_id,fname,poly,xrange,0,0,geom);
+		arg = mknode(7,s_id,fname,poly,xrange,NULLP,NULLP,geom);
 		Pox_rpc(arg,&t);
 		arg = mknode(1,s_id);
 		Pox_pop_cmo(arg,rp);
 	} else {
 		MKSTR(fname,"plot");
-		arg = mknode(8,s_id,fname,poly,xrange,0,0,geom,wname);
+		arg = mknode(8,s_id,fname,poly,xrange,NULLP,NULLP,geom,wname);
 		Pox_rpc(arg,&t);
 		*rp = (Obj)s_id;
 	}
@@ -571,7 +571,7 @@ void Ppolarplot(NODE arg,Q *rp)
 		MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n);
 	}
 	MKSTR(fname,"plot");
-	arg = mknode(8,s_id,fname,poly,0,0,zrange,geom,wname);
+	arg = mknode(8,s_id,fname,poly,NULLP,NULLP,zrange,geom,wname);
 	Pox_rpc(arg,&t);
 	*rp = s_id;
 }
@@ -595,12 +595,12 @@ void Pplotover(NODE arg,Q *rp)
 	*rp = s_id;
 }
 
-/* arg = [x,y,r,s_id,index] */
+/* arg = [x,y,r,c,s_id,index] */
 
 void Pdrawcircle(NODE arg,Q *rp)
 {
 	Q s_id,index;
-	Obj x,y,r;
+	Obj x,y,r,c;
 	STRING fname;
 	NODE n;
 	LIST pos;
@@ -609,11 +609,12 @@ void Pdrawcircle(NODE arg,Q *rp)
 	x = (Obj)ARG0(arg);
 	y = (Obj)ARG1(arg);
 	r = (Obj)ARG2(arg);
-	s_id = (Q)ARG3(arg);
-	index = (Q)ARG4(arg);
+	c = (Obj)ARG3(arg);
+	s_id = (Q)ARG4(arg);
+	index = (Q)ARG5(arg);
 	MKSTR(fname,"drawcircle");
 	n = mknode(3,x,y,r); MKLIST(pos,n);
-	arg = mknode(4,s_id,fname,index,pos);
+	arg = mknode(5,s_id,fname,index,pos,c);
 	Pox_rpc(arg,&t);
 	*rp = s_id;
 }