=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v retrieving revision 1.4 retrieving revision 1.9 diff -u -p -r1.4 -r1.9 --- OpenXM_contrib2/asir2000/plot/plotf.c 2000/08/21 08:31:51 1.4 +++ OpenXM_contrib2/asir2000/plot/plotf.c 2001/06/04 02:49:49 1.9 @@ -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.8 2000/11/22 04:03:11 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -53,6 +53,7 @@ #include "ifplot.h" void Pifplot(), Pconplot(), Pplotover(), Pplot(), Parrayplot(), Pdrawcircle(); +void Popen_canvas(), Pclear_canvas(), Pdraw_obj(); struct ftab plot_tab[] = { {"ifplot",Pifplot,-7}, @@ -60,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}, */ @@ -68,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; @@ -153,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), @@ -166,13 +216,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,0,geom,wname); + arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname); Pox_rpc(arg,rp); } @@ -180,7 +230,7 @@ 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 +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), @@ -290,13 +340,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 +354,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 +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); @@ -367,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, @@ -379,13 +431,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 +445,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 +472,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