Changeset 20191

Timestamp:

Oct 16, 2008, 9:19:23 AM (18 years ago)

Author:

eugene

Message:

use -noX for kapa if -plot is not selected; set output filenames based on a varargs format

File:

• trunk/Ohana/src/relphot/src/plotstuff.c (modified) (6 diffs)

trunk/Ohana/src/relphot/src/plotstuff.c

@@ -25 +25 @@
   sprintf (name, "gastro [%d]", N);
 
-  // XXX need to allow for KapaOpenNamed socket instead
-  Xgraph[N] = KapaOpen ("kapa", name);
+  // if -plot is supplied, the plots are shown on the screen; 
+  // otherwise, only the final plots are generated and saved without display
+  if (PLOTSTUFF) {
+    Xgraph[N] = KapaOpen ("kapa", name);
+  } else {
+    Xgraph[N] = KapaOpen ("kapa -noX", name);
+  }
 
   if (Xgraph[N] < 0) {
@@ -38 +43 @@
 
   if (Xgraph[N] == 0) return;
-
   KapaBox (Xgraph[N], graphmode);
   return;
@@ -66 +70 @@
 
   KapaClearSections (Xgraph[N]);
+
+  KapaSetLimits (Xgraph[N], graphmode);
+  KapaSetFont (Xgraph[N], "helvetica", 14);
+  KapaBox (Xgraph[N], graphmode);
+  // KapaSendLabel (Xgraph[N], "PSF Mag", KAPA_LABEL_XM);
+  // KapaSendLabel (Xgraph[N], "Ap Mag - PSF Mag", KAPA_LABEL_YM);
 
   KapaPrepPlot (Xgraph[N], Npts, graphmode);
@@ -95 +105 @@
 }
 
-void plot_list (Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *file) {
+// plot the vector pair to a file with name defined by the varargs format
+void plot_list (Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *format, ...) {
 
-  int i;
+  char tmp, *filename;
+  int i, Nbyte;
   StatType stats;
+  va_list argp;  
+
+  va_start (argp, format);
+  Nbyte = vsnprintf (&tmp, 0, format, argp);
+  va_end (argp);
+  if (!Nbyte) return;
+  Nbyte ++;
+
+  ALLOCATE (filename, char, Nbyte);
+  va_start (argp, format);
+  vsnprintf (filename, Nbyte, format, argp);
+  va_end (argp);
   
   stats.min = stats.max = xlist[0];
@@ -122 +146 @@
   DonePlotting (graphdata, 0);
 
-  if ((file != NULL) && SAVEPLOT) JpegPlot (graphdata, 0, file);
+  if (SAVEPLOT) JpegPlot (graphdata, 0, filename);
   if (PLOTDELAY > 500000) {
     fprintf (stdout, "press return\n"); 
@@ -129 +153 @@
     usleep (PLOTDELAY);
   }
+  free (filename);
 }