===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/smoothing.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- OpenXM_contrib2/asir2000/plot/smoothing.c	2001/04/07 10:53:15	1.5
+++ OpenXM_contrib2/asir2000/plot/smoothing.c	2002/07/11 12:35:03	1.7
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/plot/smoothing.c,v 1.4 2000/11/08 05:49:35 takayama Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/plot/smoothing.c,v 1.6 2002/07/11 03:34:34 takayama Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -50,6 +50,7 @@ static void polyLine_outputProlog(int xmin, int ymin,i
   fflush(Fp);
 }
 static void polyLine_outputEpilog(void) {
+  fprintf(Fp,"0 0 0 setrgbcolor \n");
   fprintf(Fp,"showpage \n"); fflush(Fp);
 }
 static void polyLine_error(char *s) {
@@ -119,7 +120,7 @@ struct canvas *can;
 
 generatePS_from_image(FILE *fp,XImage *image,int xsize, int ysize,
 					  int color[],int colorSize,
-					  struct canvas *can) {
+					  struct canvas *can,struct xcolorForPS *tableOfxcolorForPS) {
   struct polyLine **pl;
   int plSize = 0;
   int *prev;
@@ -133,22 +134,27 @@ generatePS_from_image(FILE *fp,XImage *image,int xsize
   polyLine_outputProlog(0,0,Xsize,Ysize);
   switch(Strategy_generate_PS) {
   default:
-	for (c=0; c<colorSize; c++) {
-	  /* Set color if necessary */
-	  for (x=0; x<Xsize; x++) {
-		for (y=0; y<Ysize; y++) {
-		  if ((int) XGetPixel(image,x,y) == color[c]){
-			fprintf(Fp," %d %d ", translateX(x),translateY(y) );
-			fprintf(Fp," ifplot_putpixel\n");
-		  }
-		}
-	  }
-	}
-	break;
+    fprintf(Fp,"%% debug info : colorSize=%d\n",colorSize);
+    for (c=0; c<colorSize; c++) {
+      /* Set color by looking at tableOfxcolorForPS.
+      */
+      fprintf(Fp,"%f %f %f setrgbcolor \n",(tableOfxcolorForPS[c]).r,(tableOfxcolorForPS[c]).g,(tableOfxcolorForPS[c]).b);
+      for (x=0; x<Xsize; x++) {
+        for (y=0; y<Ysize; y++) {
+          if ((tableOfxcolorForPS[c]).print &&
+              XGetPixel(image,x,y) == (tableOfxcolorForPS[c]).pixel){
+            fprintf(Fp," %d %d ", translateX(x),translateY(y) );
+            fprintf(Fp," ifplot_putpixel\n");
+          }
+        }
+      }
+    }
+    break;
   }
   polyLine_pline(can);
   polyLine_outputEpilog();
 }
+