===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/smoothing.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM_contrib2/asir2000/plot/smoothing.c	2001/04/07 10:53:15	1.5
+++ OpenXM_contrib2/asir2000/plot/smoothing.c	2002/07/20 02:28:08	1.8
@@ -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.7 2002/07/11 12:35:03 takayama Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -12,7 +12,7 @@
 
 static FILE *Fp = NULL;
 
-static void polyLine_outputProlog(int xmin, int ymin, int xmax, int ymax);
+static void polyLine_outputProlog(int xmin, int ymin, int xmax, int ymax, int upsidedown);
 static void polyLine_outputEpilog(void);
 static void polyLine_error(char *s);
 #define translateX(x)  (x*MAG+PRINT_XOFFSET)
@@ -31,7 +31,7 @@ static int polyLine_pline(struct canvas *can);
 static int Strategy_generate_PS = 0;
 
 
-static void polyLine_outputProlog(int xmin, int ymin,int xmax, int ymax) {
+static void polyLine_outputProlog(int xmin, int ymin,int xmax, int ymax, int upsidedown) {
   fprintf(Fp,"%%!PS-Adobe-1.0\n");
   fprintf(Fp,"%%%%BoundingBox: %d %d %d %d \n",
 		  PRINT_XOFFSET+xmin*MAG,PRINT_YOFFSET+ymin*MAG,
@@ -39,6 +39,8 @@ static void polyLine_outputProlog(int xmin, int ymin,i
   fprintf(Fp,"%%%%Creator: This is generated by ifplot\n");
   fprintf(Fp,"%%%%Title: ifplot\n");
   fprintf(Fp,"%%%%EndComments: \n");
+  if ( upsidedown )
+	fprintf(Fp,"[1 0 0 -1 0 %d] concat \n",2*PRINT_YOFFSET+(ymin+ymax)*MAG);
   fprintf(Fp,"0.1 setlinewidth \n");
   fprintf(Fp,"2 setlinecap \n");
   fprintf(Fp,"2 setlinejoin \n");
@@ -50,6 +52,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,36 +122,43 @@ 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,
+					  int upsidedown) {
   struct polyLine **pl;
   int plSize = 0;
   int *prev;
   int *curr;
   int i,x,y,c;
   extern int Strategy_generate_PS;
-
   Xsize = xsize;
   Ysize = ysize;
   Fp = fp;
-  polyLine_outputProlog(0,0,Xsize,Ysize);
+  polyLine_outputProlog(0,0,Xsize,Ysize,upsidedown);
   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;
   }
+  /* XXX : reset the color to black */
+  fprintf(Fp,"0 0 0 setrgbcolor \n");
   polyLine_pline(can);
   polyLine_outputEpilog();
 }
+