[BACK]Return to if.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / plot

Diff for /OpenXM_contrib2/asir2000/plot/if.c between version 1.13 and 1.14

version 1.13, 2002/08/02 09:29:17 version 1.14, 2002/08/02 09:44:37
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.12 2002/08/02 08:59:47 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.13 2002/08/02 09:29:17 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 138  int plot(NODE arg)
Line 138  int plot(NODE arg)
         else          else
                 can->wname = "";                  can->wname = "";
         can->formula = formula;          can->formula = formula;
         create_canvas(can);  
         if ( can->mode == MODE_PLOT ) {          if ( can->mode == MODE_PLOT ) {
                 plotcalc(can);                  plotcalc(can);
                   create_canvas(can);
                 plot_print(display,can);                  plot_print(display,can);
         } else if ( can->mode == MODE_POLARPLOT ) {          } else if ( can->mode == MODE_POLARPLOT ) {
                 polarplotcalc(can);                  polarplotcalc(can);
                   create_canvas(can);
                 plot_print(display,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 {          } else {
                 can->width = QTOS((Q)BDY(BDY(wsize)));                  create_canvas(can);
                 can->height = QTOS((Q)BDY(NEXT(BDY(wsize))));                  ifplotmain(can);
         }          }
         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);          copy_to_canvas(can);
         return id;          return id;
 }  }
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>