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

Diff for /OpenXM_contrib2/asir2000/plot/calc.c between version 1.3 and 1.4

version 1.3, 2000/08/22 05:04:30 version 1.4, 2001/08/22 09:19:21
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/calc.c,v 1.2 2000/08/21 08:31:50 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/plot/calc.c,v 1.3 2000/08/22 05:04:30 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "ifplot.h"  #include "ifplot.h"
Line 56 
Line 56 
   
 double usubstrp(P,double);  double usubstrp(P,double);
   
 void calc(tab,can)  void calc(tab,can,nox)
 double **tab;  double **tab;
 struct canvas *can;  struct canvas *can;
   int nox;
 {  {
         double x,y,xmin,ymin,xstep,ystep;          double x,y,xmin,ymin,xstep,ystep;
         int ix,iy;          int ix,iy;
Line 68  struct canvas *can;
Line 69  struct canvas *can;
         V vx,vy;          V vx,vy;
         Obj t,s;          Obj t,s;
   
         initmarker(can,"Evaluating...");          if ( !nox ) initmarker(can,"Evaluating...");
         MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr);          MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr);
         vx = can->vx;          vx = can->vx;
         vy = can->vy;          vy = can->vy;
Line 79  struct canvas *can;
Line 80  struct canvas *can;
         for( ix = 0, x = xmin; ix < w ; ix++, x += xstep ) {          for( ix = 0, x = xmin; ix < w ; ix++, x += xstep ) {
 #if 0  #if 0
                 MKReal(x,r); substp(CO,fr,vx,(P)r,&g);                  MKReal(x,r); substp(CO,fr,vx,(P)r,&g);
                 marker(can,DIR_X,ix);                  if ( !nox ) marker(can,DIR_X,ix);
                 for( iy = 0, y = ymin; iy < h ; iy++, y += ystep )                  for( iy = 0, y = ymin; iy < h ; iy++, y += ystep )
                         tab[ix][iy] = usubstrp(g,y);                          tab[ix][iy] = usubstrp(g,y);
 #endif  #endif
                 BDY(rx) = x; substr(CO,0,fr,vx,x?(P)rx:0,&t); devalr(CO,t,&g);                  BDY(rx) = x; substr(CO,0,fr,vx,x?(P)rx:0,&t); devalr(CO,t,&g);
                 marker(can,DIR_X,ix);                  if ( !nox ) marker(can,DIR_X,ix);
                 for( iy = 0, y = ymin; iy < h ; iy++, y += ystep ) {                  for( iy = 0, y = ymin; iy < h ; iy++, y += ystep ) {
                         BDY(ry) = y;                          BDY(ry) = y;
                         substr(CO,0,g,vy,y?(P)ry:0,&t); devalr(CO,t,&s);                          substr(CO,0,g,vy,y?(P)ry:0,&t); devalr(CO,t,&s);

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>