===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/calc.c,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -p -r1.9 -r1.11
--- OpenXM_contrib2/asir2000/plot/calc.c	2013/12/19 06:04:09	1.9
+++ OpenXM_contrib2/asir2000/plot/calc.c	2014/06/27 07:58:29	1.11
@@ -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/calc.c,v 1.8 2011/08/10 04:51:58 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/calc.c,v 1.10 2014/05/12 16:54:40 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -60,8 +60,8 @@
 #endif
 
 void calc(double **tab,struct canvas *can,int nox){
-	//memory_plot,MODE_IFPLOTD,MODE_INEQND,MODE_INEQNANDD,MODE_INEQNORD
-	//MODE_INEQNXORD,conplotmainD
+	//memory_plot,IFPLOTD,INEQND,INEQNANDD,INEQNORD
+	//INEQNXORD,conplotmainD
 	double x,y,xstep,ystep;
 	int ix,iy;
 	Real r,rx,ry;
@@ -93,7 +93,7 @@ void calc(double **tab,struct canvas *can,int nox){
 }
 
 void calcq(double **tab,struct canvas *can,int nox){
-	//MODE_IFPLOTQ,MODE_INEQNQ,MODE_INEQNANDQ,MODE_INEQNORQ,MODE_INEQNXORQ
+	//IFPLOTQ,INEQNQ,INEQNANDQ,INEQNORQ,INEQNXORQ
 	//plotoverD
 	Q dx,dy,xstep,ystep,q1,w,h,c;
 	P g,g1,f1,f2,x,y;
@@ -131,7 +131,7 @@ void calcq(double **tab,struct canvas *can,int nox){
 }
 
 void calcb(double **tab,struct canvas *can,int nox){
-	//MODE_IFPLOTB,MODE_INEQNB,MODE_INEQNANDB,MODE_INEQNORB,MODE_INEQNXORB
+	//IFPLOTB,INEQNB,INEQNANDB,INEQNORB,INEQNXORB
 	Q dx,dy,xstep,ystep,q1,w,h,c;
 	P g,g1,f1,f2,x,y,t,s;
 	int ix,iy,*a,*pa;
@@ -418,9 +418,8 @@ void plotcalc(struct canvas *can){
 	}
 }
 
-void polarplotcalc(struct canvas *can){
-	//polarplotNG
-	double xmax,xmin,ymax,ymin,dx,dy,pmin,pstep,tr,p, *tabx,*taby;
+void polarcalc(struct canvas *can){
+	double xmax,xmin,ymax,ymin,dx,dy,pmin,pstep,tr,p,*tabx,*taby;
 	double usubstrp();
 	int i,nstep,w,h;
 	POINT *pa;
@@ -433,13 +432,14 @@ void polarplotcalc(struct canvas *can){
 	tabx=(double *)ALLOCA(nstep*sizeof(double));
 	taby=(double *)ALLOCA(nstep*sizeof(double));
 	MKReal(1,r); // dummy real number
+
 	for(i=0,p=pmin;i<nstep;i++,p+= pstep){
 		// full substitution
 		BDY(r)=p;
 		substr(CO,0,fr,can->vx,p?(Obj)r:0,&s);
 		devalr(CO,(Obj)s,&t);
 		if(t&&(OID(t)!=O_N||NID((Num)t)!=N_R))
-			error("polarplotcalc : invalid evaluation");
+			error("polarcalc : invalid evaluation");
 		tr=ToReal((Num)t);	
 		tabx[i]=tr*cos(p);
 		taby[i]=tr*sin(p);
@@ -465,6 +465,55 @@ void polarplotcalc(struct canvas *can){
 	}
 }
 
+void polarcalcNG(struct canvas *can){
+	//polarplotNG
+	double xmax,xmin,ymax,ymin,dx,dy,pmin,pstep,tr,p, *tabx,*taby;
+	double usubstrp();
+	int i,ix,iy,nstep,w,h;
+	POINT *pa;
+	Real r;
+	Obj fr,t,s;
+
+	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr); 
+	w=can->width; h=can->height; nstep=can->nzstep;
+	pmin=can->zmin; pstep=(can->zmax-can->zmin)/nstep;
+	tabx=(double *)ALLOCA(nstep*sizeof(double));
+	taby=(double *)ALLOCA(nstep*sizeof(double));
+	MKReal(1,r); // dummy real number
+
+	for(i=0,p=pmin;i<nstep;i++,p+= pstep){
+		// full substitution
+		BDY(r)=p;
+		substr(CO,0,fr,can->vx,p?(Obj)r:0,&s);
+		devalr(CO,(Obj)s,&t);
+		if(t&&(OID(t)!=O_N||NID((Num)t)!=N_R))
+			error("polarcalc : invalid evaluation");
+		tr=ToReal((Num)t);	
+		tabx[i]=tr*cos(p);
+		taby[i]=tr*sin(p);
+		if(i==0){
+			xmax=xmin=tabx[0];
+			ymax=ymin=taby[0];
+		} else {
+			if(tabx[i]>xmax)xmax=tabx[i];
+			if(tabx[i]<xmin)xmin=tabx[i];
+			if(taby[i]>ymax)ymax=taby[i];
+			if(taby[i]<ymin)ymin=taby[i];
+		}
+	}
+	can->xmax=xmax;can->xmin=xmin;
+	can->ymax=ymax;can->ymin=ymin;
+	dx=xmax-xmin;
+	dy=ymax-ymin;
+	can->pa=(struct pa *)MALLOC(sizeof(struct pa));
+	can->pa[0].length=nstep;
+	can->pa[0].pos=pa=(POINT *)MALLOC(w*sizeof(POINT));
+	for(i=0;i<nstep;i++){
+		XC(pa[i])=(w-1)*(tabx[i]-xmin)/dx; 
+		YC(pa[i])=(h-1)*(ymax-taby[i])/dy; 
+	}
+}
+
 /*
 void ineqncalc(double **tab,struct canvas *can,int nox){
 	double x,y,xmin,ymin,xstep,ystep;
@@ -497,7 +546,7 @@ void ineqncalc(double **tab,struct canvas *can,int nox
 
 #if defined(INTERVAL)
 void itvcalc(double **mask, struct canvas *can, int nox){
-	//MODE_ITVIFPLOT
+	//ITVIFPLOT
 	double x,y,xstep,ystep,dx,dy,wx,wy;
 	int idv,ix,iy,idx,idy;
 	Itv ity,itx,ddx,ddy;