=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v retrieving revision 1.9 retrieving revision 1.13 diff -u -p -r1.9 -r1.13 --- OpenXM_contrib2/asir2000/plot/plotf.c 2001/06/04 02:49:49 1.9 +++ OpenXM_contrib2/asir2000/plot/plotf.c 2002/08/02 02:28:29 1.13 @@ -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.8 2000/11/22 04:03:11 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.12 2002/07/10 05:29:36 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -53,10 +53,14 @@ #include "ifplot.h" void Pifplot(), Pconplot(), Pplotover(), Pplot(), Parrayplot(), Pdrawcircle(); -void Popen_canvas(), Pclear_canvas(), Pdraw_obj(); +void Pmemory_ifplot(); +void Popen_canvas(), Pclear_canvas(), Pdraw_obj(), Pdraw_string(); +void Pox_rpc(); +void Pox_cmo_rpc(); struct ftab plot_tab[] = { {"ifplot",Pifplot,-7}, + {"memory_ifplot",Pmemory_ifplot,-7}, {"conplot",Pconplot,-8}, {"plot",Pplot,-6}, {"plotover",Pplotover,3}, @@ -64,21 +68,18 @@ struct ftab plot_tab[] = { {"open_canvas",Popen_canvas,-3}, {"clear_canvas",Pclear_canvas,2}, {"draw_obj",Pdraw_obj,-4}, + {"draw_string",Pdraw_string,-5}, /* {"arrayplot",Parrayplot,2}, */ {0,0,0}, }; -int current_s; - -void Popen_canvas(arg,rp) -NODE arg; -Obj *rp; +void Popen_canvas(NODE arg,Obj *rp) { Q w300,s_id; LIST geom; - int stream,id,i; + int stream; NODE n,n0; STRING fname,wname; @@ -104,10 +105,7 @@ Obj *rp; wname=name (STRING)] */ - if ( stream < 0 ) - stream = current_s; - else - current_s = stream; + stream = validate_ox_plot_stream(stream); STOQ(stream,s_id); if ( !geom ) { STOQ(300,w300); @@ -118,20 +116,19 @@ Obj *rp; Pox_cmo_rpc(arg,rp); } -void Pifplot(arg,rp) -NODE arg; -Obj *rp; +void Pifplot(NODE arg,Q *rp) { Q m2,p2,w300,s_id; NODE defrange; LIST xrange,yrange,range[2],list,geom; VL vl,vl0; V v[2],av[2]; - int stream,ri,id,i; + int stream,ri,i; P poly; P var; NODE n,n0; STRING fname,wname; + Obj t; STOQ(-2,m2); STOQ(2,p2); MKNODE(n,p2,0); MKNODE(defrange,m2,n); @@ -143,9 +140,9 @@ Obj *rp; switch ( OID(BDY(arg)) ) { case O_P: poly = (P)BDY(arg); - get_vars_recursive(poly,&vl); + get_vars_recursive((Obj)poly,&vl); for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) ) - if ( vl0->v->attr == V_IND ) + if ( vl0->v->attr == (pointer)V_IND ) if ( i >= 2 ) error("ifplot : invalid argument"); else @@ -212,10 +209,7 @@ Obj *rp; wname=name (STRING)] */ - if ( stream < 0 ) - stream = current_s; - else - current_s = stream; + stream = validate_ox_plot_stream(stream); STOQ(stream,s_id); if ( !geom ) { STOQ(300,w300); @@ -223,23 +217,125 @@ Obj *rp; } MKSTR(fname,"plot"); arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname); - Pox_rpc(arg,rp); + Pox_rpc(arg,&t); + *rp = s_id; } -void Pconplot(arg,rp) -NODE arg; -Obj *rp; +void Pmemory_ifplot(NODE arg,Q *rp) { Q m2,p2,w300,s_id; NODE defrange; + LIST xrange,yrange,range[2],list,geom; + VL vl,vl0; + V v[2],av[2]; + int stream,ri,i; + P poly; + P var; + NODE n,n0; + STRING fname; + Obj t; + + STOQ(-2,m2); STOQ(2,p2); + MKNODE(n,p2,0); MKNODE(defrange,m2,n); + poly = 0; vl = 0; geom = 0; stream = -1; ri = 0; + for ( ; arg; arg = NEXT(arg) ) + if ( !BDY(arg) ) + stream = 0; + else + switch ( OID(BDY(arg)) ) { + case O_P: + poly = (P)BDY(arg); + get_vars_recursive((Obj)poly,&vl); + for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) ) + if ( vl0->v->attr == (pointer)V_IND ) + if ( i >= 2 ) + error("ifplot : invalid argument"); + else + v[i++] = vl0->v; + break; + case O_LIST: + list = (LIST)BDY(arg); + if ( OID(BDY(BDY(list))) == O_P ) + if ( ri > 1 ) + error("ifplot : invalid argument"); + else + range[ri++] = list; + else + geom = list; + break; + case O_N: + stream = QTOS((Q)BDY(arg)); break; + default: + error("memory_ifplot : invalid argument"); break; + } + if ( !poly ) + error("memory_ifplot : invalid argument"); + switch ( ri ) { + case 0: + if ( !v[1] ) + error("memory_ifplot : please specify all variables"); + MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); + MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n); + break; + case 1: + if ( !v[1] ) + error("memory_ifplot : please specify all variables"); + av[0] = VR((P)BDY(BDY(range[0]))); + if ( v[0] == av[0] ) { + xrange = range[0]; + MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n); + } else if ( v[1] == av[0] ) { + MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); + yrange = range[0]; + } else + error("memory_ifplot : invalid argument"); + break; + case 2: + av[0] = VR((P)BDY(BDY(range[0]))); + av[1] = VR((P)BDY(BDY(range[1]))); + if ( ((v[0] == av[0]) && (!v[1] || v[1] == av[1])) || + ((v[0] == av[1]) && (!v[1] || v[1] == av[0])) ) { + xrange = range[0]; yrange = range[1]; + } else + error("memory_ifplot : invalid argument"); + break; + default: + error("memory_ifplot : cannot happen"); break; + } + /* memory_ifplot in ox_plot requires + [s_id (Q), + formula (Obj), + xrange=[x,xmin,xmax] (LIST), + yrange=[y,ymin,ymax] (LIST), + zrange=0, + geom=[xsize,ysize] (LIST)] + */ + + stream = validate_ox_plot_stream(stream); + STOQ(stream,s_id); + if ( !geom ) { + STOQ(300,w300); + MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); + } + MKSTR(fname,"memory_plot"); + arg = mknode(7,s_id,fname,poly,xrange,yrange,0,geom); + Pox_rpc(arg,&t); + *rp = s_id; +} + +void Pconplot(NODE arg,Q *rp) +{ + Q m2,p2,w300,s_id; + NODE defrange; LIST xrange,yrange,zrange,range[3],list,geom; VL vl,vl0; V v[2],av[2]; - int stream,ri,id,i; + int stream,ri,i; P poly; P var; NODE n,n0; STRING fname,wname; + Obj t; STOQ(-2,m2); STOQ(2,p2); MKNODE(n,p2,0); MKNODE(defrange,m2,n); @@ -251,9 +347,9 @@ Obj *rp; switch ( OID(BDY(arg)) ) { case O_P: poly = (P)BDY(arg); - get_vars_recursive(poly,&vl); + get_vars_recursive((Obj)poly,&vl); for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) ) - if ( vl0->v->attr == V_IND ) + if ( vl0->v->attr == (pointer)V_IND ) if ( i >= 2 ) error("ifplot : invalid argument"); else @@ -321,11 +417,6 @@ Obj *rp; default: error("ifplot : cannot happen"); break; } - if ( stream < 0 ) - stream = current_s; - else - current_s = stream; - /* conplot in ox_plot requires [s_id (Q), formula (Obj), @@ -336,10 +427,7 @@ Obj *rp; wname=name (STRING)] */ - if ( stream < 0 ) - stream = current_s; - else - current_s = stream; + stream = validate_ox_plot_stream(stream); STOQ(stream,s_id); if ( !geom ) { STOQ(300,w300); @@ -347,23 +435,23 @@ Obj *rp; } MKSTR(fname,"plot"); arg = mknode(8,s_id,fname,poly,xrange,yrange,zrange,geom,wname); - Pox_rpc(arg,rp); + Pox_rpc(arg,&t); + *rp = s_id; } -void Pplot(arg,rp) -NODE arg; -Obj *rp; +void Pplot(NODE arg,Q *rp) { Q m2,p2,w300,s_id; NODE defrange; LIST xrange,range[1],list,geom; VL vl,vl0; V v[1],av[1]; - int stream,ri,id,i; + int stream,ri,i; P poly; P var; NODE n,n0; STRING fname,wname; + Obj t; STOQ(-2,m2); STOQ(2,p2); MKNODE(n,p2,0); MKNODE(defrange,m2,n); @@ -375,9 +463,9 @@ Obj *rp; switch ( OID(BDY(arg)) ) { case O_P: case O_R: poly = (P)BDY(arg); - get_vars_recursive(poly,&vl); + get_vars_recursive((Obj)poly,&vl); for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) ) - if ( vl0->v->attr == V_IND ) + if ( vl0->v->attr == (pointer)V_IND ) if ( i >= 1 ) error("ifplot : invalid argument"); else @@ -427,10 +515,7 @@ Obj *rp; geom=[xsize,ysize] (LIST), wname=name (STRING)] */ - if ( stream < 0 ) - stream = current_s; - else - current_s = stream; + stream = validate_ox_plot_stream(stream); STOQ(stream,s_id); if ( !geom ) { STOQ(300,w300); @@ -438,36 +523,36 @@ Obj *rp; } MKSTR(fname,"plot"); arg = mknode(8,s_id,fname,poly,xrange,0,0,geom,wname); - Pox_rpc(arg,rp); + Pox_rpc(arg,&t); + *rp = s_id; } -void Pplotover(arg,rp) -NODE arg; -Obj *rp; +void Pplotover(NODE arg,Q *rp) { Q s_id,index; P poly; STRING fname; + Obj t; poly = (P)ARG0(arg); s_id = (Q)ARG1(arg); index = (Q)ARG2(arg); MKSTR(fname,"plotover"); arg = mknode(4,s_id,fname,index,poly); - Pox_rpc(arg,rp); + Pox_rpc(arg,&t); + *rp = s_id; } /* arg = [x,y,r,s_id,index] */ -void Pdrawcircle(arg,rp) -NODE arg; -Obj *rp; +void Pdrawcircle(NODE arg,Q *rp) { Q s_id,index; Obj x,y,r; STRING fname; NODE n; LIST pos; + Obj t; x = (Obj)ARG0(arg); y = (Obj)ARG1(arg); @@ -477,17 +562,17 @@ Obj *rp; MKSTR(fname,"drawcircle"); n = mknode(3,x,y,r); MKLIST(pos,n); arg = mknode(4,s_id,fname,index,pos); - Pox_rpc(arg,rp); + Pox_rpc(arg,&t); + *rp = s_id; } /* draw_obj(s_id,cindex,point|line); point = [x,y], line = [xa,ya,xb,yb] */ -void Pdraw_obj(arg,rp) -NODE arg; -Obj *rp; +void Pdraw_obj(NODE arg,Q *rp) { static STRING fname; Q s_id,index; LIST obj; + Obj t; if ( !fname ) { MKSTR(fname,"draw_obj"); @@ -500,30 +585,53 @@ Obj *rp; arg = mknode(5,s_id,fname,index,obj,ARG3(arg)); else arg = mknode(4,s_id,fname,index,obj); - Pox_cmo_rpc(arg,rp); + Pox_cmo_rpc(arg,&t); + *rp = s_id; } -void Pclear_canvas(arg,rp) -NODE arg; -Obj *rp; +/* draw_string(s_id,cindex,pos,string,[,color]); pos=[x,y] */ +void Pdraw_string(NODE arg,Q *rp) { static STRING fname; + STRING str; Q s_id,index; - LIST obj; + LIST pos; + Obj t; if ( !fname ) { + MKSTR(fname,"draw_string"); + } + s_id = (Q)ARG0(arg); + index = (Q)ARG1(arg); + pos = (LIST)ARG2(arg); + str = (STRING)ARG3(arg); + /* ARG4(arg) = color */ + if ( argc(arg) == 5 ) + arg = mknode(6,s_id,fname,index,pos,str,ARG4(arg)); + else + arg = mknode(5,s_id,fname,index,pos,str); + Pox_cmo_rpc(arg,&t); + *rp = s_id; +} + +void Pclear_canvas(NODE arg,Q *rp) +{ + static STRING fname; + Q s_id,index; + Obj t; + + 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); + Pox_cmo_rpc(arg,&t); + *rp = s_id; } #if 0 -void Parrayplot(arg,rp) -NODE arg; -Obj *rp; +void Parrayplot(NODE arg,Obj *rp) { int s; int id;