=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v retrieving revision 1.6 retrieving revision 1.8 diff -u -p -r1.6 -r1.8 --- OpenXM_contrib2/asir2000/plot/plotf.c 2000/11/07 06:06:40 1.6 +++ OpenXM_contrib2/asir2000/plot/plotf.c 2000/11/22 04:03:11 1.8 @@ -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.5 2000/08/22 05:04:32 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.7 2000/11/09 01:51:13 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -63,7 +63,7 @@ struct ftab plot_tab[] = { {"drawcircle",Pdrawcircle,5}, {"open_canvas",Popen_canvas,-3}, {"clear_canvas",Pclear_canvas,2}, - {"draw_obj",Pdraw_obj,3}, + {"draw_obj",Pdraw_obj,-4}, /* {"arrayplot",Parrayplot,2}, */ @@ -382,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); @@ -493,7 +495,11 @@ Obj *rp; sid = (Q)ARG0(arg); index = (Q)ARG1(arg); obj = (LIST)ARG2(arg); - arg = mknode(4,sid,fname,index,obj); + /* ARG3(arg) = color */ + if ( argc(arg) == 4 ) + arg = mknode(5,sid,fname,index,obj,ARG3(arg)); + else + arg = mknode(4,sid,fname,index,obj); Pox_cmo_rpc(arg,rp); }