=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v retrieving revision 1.11 retrieving revision 1.21 diff -u -p -r1.11 -r1.21 --- OpenXM_contrib2/asir2000/plot/plotf.c 2001/10/09 01:36:27 1.11 +++ 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.10 2001/08/22 09:19:21 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" @@ -53,30 +53,33 @@ #include "ifplot.h" void Pifplot(), Pconplot(), Pplotover(), Pplot(), Parrayplot(), Pdrawcircle(); -void Pmemory_ifplot(); -void Popen_canvas(), Pclear_canvas(), Pdraw_obj(); +void Ppolarplot(); +void Pmemory_ifplot(),Pmemory_conplot(),Pmemory_plot(); +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}, + {"memory_ifplot",Pmemory_ifplot,-6}, {"conplot",Pconplot,-8}, + {"memory_conplot",Pmemory_conplot,-7}, {"plot",Pplot,-6}, - {"plotover",Pplotover,3}, - {"drawcircle",Pdrawcircle,5}, + {"memory_plot",Pmemory_plot,-5}, + {"polarplot",Ppolarplot,-6}, + {"plotover",Pplotover,-4}, + {"drawcircle",Pdrawcircle,6}, {"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(NODE arg,Obj *rp) +void Popen_canvas(NODE arg,Q *rp) { Q w300,s_id; LIST geom; @@ -106,10 +109,7 @@ void Popen_canvas(NODE arg,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,10 +118,23 @@ 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 ifplot_main(NODE arg,int is_memory, Obj *rp); + void Pifplot(NODE arg,Obj *rp) { + ifplot_main(arg,0,rp); +} + +void Pmemory_ifplot(NODE arg,Obj *rp) +{ + ifplot_main(arg,1,rp); +} + +void ifplot_main(NODE arg,int is_memory, Obj *rp) +{ Q m2,p2,w300,s_id; NODE defrange; LIST xrange,yrange,range[2],list,geom; @@ -132,10 +145,12 @@ void Pifplot(NODE arg,Obj *rp) P var; NODE n,n0; STRING fname,wname; + Obj t; STOQ(-2,m2); STOQ(2,p2); MKNODE(n,p2,0); MKNODE(defrange,m2,n); poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 0; for ( ; arg; arg = NEXT(arg) ) if ( !BDY(arg) ) stream = 0; @@ -212,43 +227,63 @@ void Pifplot(NODE arg,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); MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); } - MKSTR(fname,"plot"); - arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname); - Pox_rpc(arg,rp); + if ( is_memory ) { + MKSTR(fname,"memory_plot"); + 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,NULLP,geom,wname); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; + } } -void Pmemory_ifplot(NODE arg,Obj *rp) +void conplot_main(NODE arg,int is_memory, Obj *rp); + +void Pconplot(NODE arg,Obj *rp) { + conplot_main(arg,0,rp); +} + +void Pmemory_conplot(NODE arg,Obj *rp) +{ + conplot_main(arg,1,rp); +} + +void conplot_main(NODE arg,int is_memory,Obj *rp) +{ Q m2,p2,w300,s_id; NODE defrange; - LIST xrange,yrange,range[2],list,geom; + LIST xrange,yrange,zrange,range[3],list,geom; VL vl,vl0; V v[2],av[2]; int stream,ri,i; P poly; P var; NODE n,n0; - STRING fname; + STRING fname,wname; + 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; + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 0; for ( ; arg; arg = NEXT(arg) ) if ( !BDY(arg) ) stream = 0; else switch ( OID(BDY(arg)) ) { case O_P: - poly = (P)BDY(arg); + 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 ) @@ -260,7 +295,7 @@ void Pmemory_ifplot(NODE arg,Obj *rp) case O_LIST: list = (LIST)BDY(arg); if ( OID(BDY(BDY(list))) == O_P ) - if ( ri > 1 ) + if ( ri > 2 ) error("ifplot : invalid argument"); else range[ri++] = list; @@ -269,102 +304,138 @@ void Pmemory_ifplot(NODE arg,Obj *rp) break; case O_N: stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; default: - error("memory_ifplot : invalid argument"); break; + error("ifplot : invalid argument"); break; } if ( !poly ) - error("memory_ifplot : invalid argument"); + error("ifplot : invalid argument"); switch ( ri ) { case 0: if ( !v[1] ) - error("memory_ifplot : please specify all variables"); + error("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); + MKNODE(n,0,defrange); MKLIST(zrange,n); break; case 1: if ( !v[1] ) - error("memory_ifplot : please specify all variables"); + error("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); + MKNODE(n,0,defrange); MKLIST(zrange,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"); + MKNODE(n,0,defrange); MKLIST(zrange,n); + } else { + MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); + MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n); + zrange = range[0]; + } break; - case 2: + case 2: case 3: 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]; + xrange = range[0]; yrange = range[1]; + if ( ri == 3 ) + zrange = range[2]; + else { + MKNODE(n,0,defrange); MKLIST(zrange,n); + } } else - error("memory_ifplot : invalid argument"); + error("ifplot : invalid argument"); break; default: - error("memory_ifplot : cannot happen"); break; + error("ifplot : cannot happen"); break; } - /* memory_ifplot in ox_plot requires + /* conplot 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)] + zrange=[z,zmin,zmax] (LIST), + 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); 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,rp); + if ( is_memory ) { + MKSTR(fname,"memory_plot"); + arg = mknode(7,s_id,fname,poly,xrange,yrange,zrange,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,zrange,geom,wname); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; + } } -void Pconplot(NODE arg,Obj *rp) +void plot_main(NODE arg,int is_memory,Obj *rp); + +void Pplot(NODE arg,Obj *rp) { + plot_main(arg,0,rp); +} + +void Pmemory_plot(NODE arg,Obj *rp) +{ + plot_main(arg,1,rp); +} + +void plot_main(NODE arg,int is_memory,Obj *rp) +{ Q m2,p2,w300,s_id; NODE defrange; - LIST xrange,yrange,zrange,range[3],list,geom; + LIST xrange,range[1],list,geom; VL vl,vl0; - V v[2],av[2]; + V v[1],av[1]; 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); poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = 0; for ( ; arg; arg = NEXT(arg) ) if ( !BDY(arg) ) stream = 0; else switch ( OID(BDY(arg)) ) { - case O_P: + case O_P: case O_R: 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 ) + if ( i >= 1 ) error("ifplot : invalid argument"); else v[i++] = vl0->v; + if ( i != 1 ) + error("ifplot : invalid argument"); break; case O_LIST: list = (LIST)BDY(arg); if ( OID(BDY(BDY(list))) == O_P ) - if ( ri > 2 ) - error("ifplot : invalid argument"); + if ( ri > 0 ) + error("plot : invalid argument"); else range[ri++] = list; else @@ -375,87 +446,60 @@ void Pconplot(NODE arg,Obj *rp) case O_STR: wname = (STRING)BDY(arg); break; default: - error("ifplot : invalid argument"); break; + error("plot : invalid argument"); break; } if ( !poly ) - error("ifplot : invalid argument"); + error("plot : invalid argument"); switch ( ri ) { case 0: - if ( !v[1] ) - error("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); - MKNODE(n,0,defrange); MKLIST(zrange,n); break; case 1: - if ( !v[1] ) - error("ifplot : please specify all variables"); av[0] = VR((P)BDY(BDY(range[0]))); - if ( v[0] == av[0] ) { + if ( v[0] == av[0] ) xrange = range[0]; - MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n); - MKNODE(n,0,defrange); MKLIST(zrange,n); - } else if ( v[1] == av[0] ) { - MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); - yrange = range[0]; - MKNODE(n,0,defrange); MKLIST(zrange,n); - } else { - MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); - MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n); - zrange = range[0]; - } + else + error("plot : invalid argument"); break; - case 2: case 3: - 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]; - if ( ri == 3 ) - zrange = range[2]; - else { - MKNODE(n,0,defrange); MKLIST(zrange,n); - } - } else - error("ifplot : invalid argument"); - break; default: - error("ifplot : cannot happen"); break; + error("plot : cannot happen"); break; } - if ( stream < 0 ) - stream = current_s; - else - current_s = stream; - /* conplot in ox_plot requires [s_id (Q), formula (Obj), xrange=[x,xmin,xmax] (LIST), - yrange=[y,ymin,ymax] (LIST), - zrange=[z,zmin,zmax] (LIST), + yrange=0, + zrange=0, 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); MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); } - MKSTR(fname,"plot"); - arg = mknode(8,s_id,fname,poly,xrange,yrange,zrange,geom,wname); - Pox_rpc(arg,rp); + if ( is_memory ) { + MKSTR(fname,"memory_plot"); + 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,NULLP,NULLP,geom,wname); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; + } } -void Pplot(NODE arg,Obj *rp) +#define Pi 3.14159265358979323846264 + +void Ppolarplot(NODE arg,Q *rp) { Q m2,p2,w300,s_id; NODE defrange; - LIST xrange,range[1],list,geom; + LIST zrange,range[1],list,geom; VL vl,vl0; V v[1],av[1]; int stream,ri,i; @@ -463,10 +507,13 @@ void Pplot(NODE arg,Obj *rp) P var; NODE n,n0; STRING fname,wname; + Real pi2; + Obj t; - STOQ(-2,m2); STOQ(2,p2); - MKNODE(n,p2,0); MKNODE(defrange,m2,n); + MKReal(2*Pi,pi2); + MKNODE(n,pi2,0); MKNODE(defrange,0,n); poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = 0; for ( ; arg; arg = NEXT(arg) ) if ( !BDY(arg) ) stream = 0; @@ -478,17 +525,17 @@ void Pplot(NODE arg,Obj *rp) for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) ) if ( vl0->v->attr == (pointer)V_IND ) if ( i >= 1 ) - error("ifplot : invalid argument"); + error("polarplot : invalid argument"); else v[i++] = vl0->v; if ( i != 1 ) - error("ifplot : invalid argument"); + error("polarplot : invalid argument"); break; case O_LIST: list = (LIST)BDY(arg); if ( OID(BDY(BDY(list))) == O_P ) if ( ri > 0 ) - error("plot : invalid argument"); + error("polarplot : invalid argument"); else range[ri++] = list; else @@ -499,88 +546,86 @@ void Pplot(NODE arg,Obj *rp) case O_STR: wname = (STRING)BDY(arg); break; default: - error("plot : invalid argument"); break; + error("polarplot : invalid argument"); break; } if ( !poly ) - error("plot : invalid argument"); + error("polarplot : invalid argument"); switch ( ri ) { case 0: - MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); + MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(zrange,n); break; case 1: av[0] = VR((P)BDY(BDY(range[0]))); if ( v[0] == av[0] ) - xrange = range[0]; + zrange = range[0]; else - error("plot : invalid argument"); + error("polarplot : invalid argument"); break; default: - error("plot : cannot happen"); break; + error("polarplot : cannot happen"); break; } - /* conplot in ox_plot requires - [s_id (Q), - formula (Obj), - xrange=[x,xmin,xmax] (LIST), - yrange=0, - zrange=0, - 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); MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); } MKSTR(fname,"plot"); - arg = mknode(8,s_id,fname,poly,xrange,0,0,geom,wname); - Pox_rpc(arg,rp); + arg = mknode(8,s_id,fname,poly,NULLP,NULLP,zrange,geom,wname); + Pox_rpc(arg,&t); + *rp = s_id; } -void Pplotover(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); + 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; } -/* arg = [x,y,r,s_id,index] */ +/* arg = [x,y,r,c,s_id,index] */ -void Pdrawcircle(NODE arg,Obj *rp) +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; + Obj t; 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); - Pox_rpc(arg,rp); + arg = mknode(5,s_id,fname,index,pos,c); + 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(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"); @@ -593,21 +638,49 @@ void Pdraw_obj(NODE arg,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(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 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