=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v retrieving revision 1.10 retrieving revision 1.13 diff -u -p -r1.10 -r1.13 --- OpenXM_contrib2/asir2000/plot/if.c 2002/07/29 03:08:16 1.10 +++ OpenXM_contrib2/asir2000/plot/if.c 2002/08/02 09:29:17 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/if.c,v 1.9 2002/07/10 05:29:35 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.12 2002/08/02 08:59:47 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -88,6 +88,7 @@ int plot(NODE arg) P formula; LIST xrange,yrange,zrange,wsize; STRING wname; + V v; formula = (P)ARG0(arg); xrange = (LIST)ARG1(arg); @@ -97,25 +98,35 @@ int plot(NODE arg) wname = (STRING)ARG5(arg); can = canvas[id = search_canvas()]; - n = BDY(xrange); can->vx = VR((P)BDY(n)); n = NEXT(n); - can->qxmin = (Q)BDY(n); n = NEXT(n); can->qxmax = (Q)BDY(n); - can->xmin = ToReal(can->qxmin); can->xmax = ToReal(can->qxmax); + if ( xrange ) { + n = BDY(xrange); can->vx = VR((P)BDY(n)); n = NEXT(n); + can->qxmin = (Q)BDY(n); n = NEXT(n); can->qxmax = (Q)BDY(n); + can->xmin = ToReal(can->qxmin); can->xmax = ToReal(can->qxmax); + } if ( yrange ) { n = BDY(yrange); can->vy = VR((P)BDY(n)); n = NEXT(n); can->qymin = (Q)BDY(n); n = NEXT(n); can->qymax = (Q)BDY(n); can->ymin = ToReal(can->qymin); can->ymax = ToReal(can->qymax); - if ( zrange ) { - n = NEXT(BDY(zrange)); - can->zmin = ToReal(BDY(n)); n = NEXT(n); can->zmax = ToReal(BDY(n)); - if ( n = NEXT(n) ) - can->nzstep = QTOS((Q)BDY(n)); - else - can->nzstep = MAXGC; - can->mode = MODE_CONPLOT; - } else - can->mode = MODE_IFPLOT; - } else - can->mode = MODE_PLOT; + } + if ( xrange && yrange ) + can->mode = zrange ? MODE_CONPLOT : MODE_IFPLOT; + else + can->mode = xrange ? MODE_PLOT : MODE_POLARPLOT; + + if ( zrange ) { + n = BDY(zrange); v = VR((P)BDY(n)); n = NEXT(n); + can->zmin = ToReal(BDY(n)); + n = NEXT(n); can->zmax = ToReal(BDY(n)); + n = NEXT(n); + if ( can->mode == MODE_CONPLOT ) + can->nzstep = n ? QTOS((Q)BDY(n)) : MAXGC; + else { + /* XXX */ + can->vx = v; + can->nzstep = n ? QTOS((Q)BDY(n)) : DEFAULTPOLARSTEP; + } + } + if ( !wsize ) { can->width = DEFAULTWIDTH; can->height = DEFAULTHEIGHT; } else { @@ -131,12 +142,54 @@ int plot(NODE arg) if ( can->mode == MODE_PLOT ) { plotcalc(can); plot_print(display,can); + } else if ( can->mode == MODE_POLARPLOT ) { + polarplotcalc(can); + plot_print(display,can); } else ifplotmain(can); copy_to_canvas(can); return id; } +int polarplot(NODE arg) +{ + int id; + NODE n; + struct canvas *can; + P formula; + LIST xrange,yrange,zrange,wsize; + STRING wname; + + formula = (P)ARG0(arg); + xrange = (LIST)ARG1(arg); + wsize = (LIST)ARG4(arg); + wname = (STRING)ARG5(arg); + + can = canvas[id = search_canvas()]; + n = BDY(xrange); can->vx = VR((P)BDY(n)); n = NEXT(n); + /* XXX use zmin, zmax to hold parameter range */ + can->zmin = ToReal((Num)BDY(n)); n = NEXT(n); + can->zmax = ToReal((Num)BDY(n)); + can->mode = MODE_POLARPLOT; + if ( !wsize ) { + can->width = DEFAULTWIDTH; can->height = DEFAULTHEIGHT; + } else { + can->width = QTOS((Q)BDY(BDY(wsize))); + can->height = QTOS((Q)BDY(NEXT(BDY(wsize)))); + } + if ( wname ) + can->wname = BDY(wname); + else + can->wname = ""; + can->formula = formula; + polarplotcalc(can); + /* xmax, xmin etc are determined after calc */ + create_canvas(can); + plot_print(display,can); + copy_to_canvas(can); + return id; +} + int memory_plot(NODE arg,LIST *bytes) { NODE n; @@ -320,8 +373,14 @@ int draw_string(NODE arg) index = QTOS((Q)ARG0(arg)); can = canvas[index]; - if ( !can || !can->window ) { - set_lasterror("draw_string : canvas does not exist"); + if ( !can && closed_canvas[index] ) { + canvas[index] = closed_canvas[index]; + closed_canvas[index] = 0; + can = canvas[index]; + popup_canvas(index); + current_can = can; + } else if ( !can || (can && !can->window) ) { + set_lasterror("draw_obj : canvas does not exist"); return -1; }