=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v retrieving revision 1.15 retrieving revision 1.17 diff -u -p -r1.15 -r1.17 --- OpenXM_contrib2/asir2000/plot/plotf.c 2002/08/02 08:59:48 1.15 +++ OpenXM_contrib2/asir2000/plot/plotf.c 2005/05/18 03:27:00 1.17 @@ -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.14 2002/08/02 05:39:22 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.16 2002/10/02 01:38:04 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -65,7 +65,7 @@ struct ftab plot_tab[] = { {"conplot",Pconplot,-8}, {"plot",Pplot,-6}, {"polarplot",Ppolarplot,-6}, - {"plotover",Pplotover,3}, + {"plotover",Pplotover,-4}, {"drawcircle",Pdrawcircle,5}, {"open_canvas",Popen_canvas,-3}, {"clear_canvas",Pclear_canvas,2}, @@ -77,7 +77,7 @@ struct ftab plot_tab[] = { {0,0,0}, }; -void Popen_canvas(NODE arg,Obj *rp) +void Popen_canvas(NODE arg,Q *rp) { Q w300,s_id; LIST geom; @@ -116,6 +116,7 @@ void Popen_canvas(NODE arg,Obj *rp) MKSTR(fname,"open_canvas"); arg = mknode(4,s_id,fname,geom,wname); Pox_cmo_rpc(arg,rp); + *rp = s_id; } void Pifplot(NODE arg,Q *rp) @@ -626,7 +627,10 @@ void Pplotover(NODE arg,Q *rp) s_id = (Q)ARG1(arg); index = (Q)ARG2(arg); MKSTR(fname,"plotover"); - arg = mknode(4,s_id,fname,index,poly); + if ( argc(arg) == 4 ) + arg = mknode(5,s_id,fname,index,poly,(Q)ARG3(arg)); + else + arg = mknode(4,s_id,fname,index,poly); Pox_rpc(arg,&t); *rp = s_id; }