===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotp.c,v
retrieving revision 1.17
retrieving revision 1.20
diff -u -p -r1.17 -r1.20
--- OpenXM_contrib2/asir2000/plot/plotp.c	2014/05/12 16:54:41	1.17
+++ OpenXM_contrib2/asir2000/plot/plotp.c	2014/07/05 03:55:42	1.20
@@ -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/plotp.c,v 1.16 2013/12/19 05:48:25 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/plotp.c,v 1.19 2014/06/27 07:58:29 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -63,7 +63,6 @@
 static POINT oldpos;
 #endif
 
-#if defined(INTERVAL)
 unsigned long GetColor(Display *, char *);
 
 unsigned long GetColor(Display *dis, char *color_name)
@@ -80,7 +79,8 @@ void area_print(DISPLAY *display,double **tab,struct c
 	int ix,iy,width,height,wc,**mask;
 	XImage *image;
 	DRAWABLE pix;
-	unsigned long color,black,white,c2;
+	unsigned int color,black,white,c2;
+	//unsigned long color,black,white,c2;
 	double *px,*px1,*px2;
 	//GXcode 0:new 1:cp 2:and 3:or 4:xor
 	width=can->width;
@@ -156,9 +156,8 @@ void over_print(DISPLAY *display,double **tab,struct c
 	}
 	flush();
 }
-#endif
 
-void if_print(DISPLAY *display,double **tab,struct canvas *can,int cond){
+void if_printNG(DISPLAY *display,double **tab,struct canvas *can,int cond){
 	int ix,iy,width,height;
 	double zst,zed,zsp;
 	DRAWABLE pix;
@@ -183,15 +182,16 @@ void if_print(DISPLAY *display,double **tab,struct can
 }
 
 void polar_print(DISPLAY *display,struct canvas *can){
-	int len,color,i,j,x,y;
+	int len,i,j,x,y;
+	unsigned int color;
 	POINT *pa;
 
-	len=can->pa[0].length;
-	color=can->color;
-	pa=can->pa[0].pos;
 #if defined(VISUAL)
 	HDC dc;
 	HPEN pen,oldpen;
+	len=can->pa[0].length;
+	color=can->color;
+	pa=can->pa[0].pos;
 	for(i=1;i<len;i++){
 		j=i-1;
 		if(color){
@@ -215,6 +215,9 @@ void polar_print(DISPLAY *display,struct canvas *can){
 		}
 	}
 #else
+	len=can->pa[0].length;
+	color=can->color;
+	pa=can->pa[0].pos;
 	for(i=1;i<len;i++){
 		j=i-1;
 		DRAWLINE(display,can->pix,cdrawGC,XC(pa[j]),YC(pa[j]),XC(pa[i]),YC(pa[i]));
@@ -224,7 +227,26 @@ void polar_print(DISPLAY *display,struct canvas *can){
 }
 
 
-void if_printOld(DISPLAY *display,double **tab,struct canvas *can){
+void if_print(DISPLAY *display,double **tab,struct canvas *can){
+	int ix,iy,width,height;
+	double *px,*px1,*px2;
+	DRAWABLE pix;
+
+	if ( can->mode == modeNO(CONPLOT) ) {
+		con_print(display,tab,can); return;
+	}
+	flush();
+	width = can->width; height = can->height; pix = can->pix;
+	for( ix=0; ix<width-1; ix++ )
+		for(iy=0, px=tab[ix], px1 = tab[ix+1], px2 = px+1;
+			iy<height-1 ;iy++, px++, px1++, px2++ )
+			if ( ((*px >= 0) && ((*px1 <= 0) || (*px2 <= 0))) ||
+				((*px <= 0) && ((*px1 >= 0) || (*px2 >= 0))) ) {
+		DRAWPOINT(display,pix,cdrawGC,ix,height-iy-1);
+		count_and_flush();
+	}
+	flush();
+/*
 	int i,ix,iy,width,height;
 	double *px,*px1,*px2;
 	double **vmax,**vmin,*zst,zstep,zv,u,l;
@@ -278,6 +300,7 @@ void if_printOld(DISPLAY *display,double **tab,struct 
 			}
 	}
 	flush();
+*/
 }
 
 #define MEMORY_DRAWPOINT(a,len,x,y) (((a)[(len)*(y)+((x)>>3)]) |= (1<<((x)&7)))
@@ -444,7 +467,8 @@ void plot_print(DISPLAY *display,struct canvas *can){
 #endif
 }
 
-void draw_point(DISPLAY *display,struct canvas *can,int x,int y,int color){
+void draw_point(DISPLAY *display,struct canvas *can,int x,int y,unsigned int color){
+//void draw_point(DISPLAY *display,struct canvas *can,int x,int y,int color){
 #if defined(VISUAL)
 	HDC dc;
 
@@ -461,7 +485,8 @@ void draw_point(DISPLAY *display,struct canvas *can,in
 }
 
 void draw_line(
-	DISPLAY *display,struct canvas *can,int x,int y,int u,int v,int color){
+	DISPLAY *display,struct canvas *can,int x,int y,int u,int v,unsigned int color){
+	//DISPLAY *display,struct canvas *can,int x,int y,int u,int v,int color){
 #if defined(VISUAL)
 	HDC dc;
 	HPEN pen,oldpen;
@@ -494,7 +519,8 @@ void draw_line(
 }
 
 void draw_character_string(
-	DISPLAY *display,struct canvas *can,int x,int y,char *str,int color){
+	DISPLAY *display,struct canvas *can,int x,int y,char *str,unsigned int color){
+	//DISPLAY *display,struct canvas *can,int x,int y,char *str,int color){
 #if defined(VISUAL)
 	HDC dc;
 	COLORREF oldcolor;