Changeset 31615 for branches/eam_branches/ipp-20110505/Ohana/src/opihi

Timestamp:

Jun 8, 2011, 11:47:27 AM (15 years ago)

Author:

eugene

Message:

updates to allow read vectors from CSV files; point colors scaled by vector (zcplot)

Location:

branches/eam_branches/ipp-20110505/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/Makefile (modified) (2 diffs)
• src/opihi/cmd.data/init.c (modified) (2 diffs)
• src/opihi/cmd.data/read_vectors.c (modified) (4 diffs)
• src/opihi/cmd.data/tvcolors.c (modified) (2 diffs)
• src/opihi/cmd.data/zplot.c (modified) (1 diff)

branches/eam_branches/ipp-20110505/Ohana/src/opihi/Makefile

@@ -23 +23 @@
 
 all:
-        for i in $(PROGRAM) $(SPECIAL); do make $$i || exit; done
-        make pantasks_client
-        make pantasks_server
+        for i in $(PROGRAM) $(SPECIAL); do $(MAKE) $$i || exit; done
+        $(MAKE) pantasks_client
+        $(MAKE) pantasks_server
 
 libs:
-        for i in $(LIBS); do make $$i || exit; done
+        for i in $(LIBS); do $(MAKE) $$i || exit; done
 
 extras:
-        for i in $(EXTRAS); do make $$i || exit; done
+        for i in $(EXTRAS); do $(MAKE) $$i || exit; done
 
 install:
-        for i in $(PROGRAM) $(SPECIAL); do make $$i.install || exit; done
-        make pantasks_client.install
-        make pantasks_server.install
+        for i in $(PROGRAM) $(SPECIAL); do $(MAKE) $$i.install || exit; done
+        $(MAKE) pantasks_client.install
+        $(MAKE) pantasks_server.install
 
 extras-install:
-        for i in $(EXTRAS); do make $$i.install || exit; done
+        for i in $(EXTRAS); do $(MAKE) $$i.install || exit; done
 
 clean:
-        for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do make $$i.clean || exit; done
+        for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do $(MAKE) $$i.clean || exit; done
 
 libs-uninstall:
-        for i in $(LIBS); do make $$i.uninstall || exit; done
+        for i in $(LIBS); do $(MAKE) $$i.uninstall || exit; done
 
 dist: clean
-        for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do make $$i.dist || exit; done
+        for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do $(MAKE) $$i.dist || exit; done
         rm -rf bin
         rm -rf lib
@@ -55 +55 @@
 
 pantasks_client pantasks_server:
-        if [ -d pantasks ]; then (cd pantasks && make $@); fi
+        if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
 
 pantasks_client.install: pantasks_client
-        if [ -d pantasks ]; then (cd pantasks && make $@); fi
+        if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
 
 pantasks_server.install: pantasks_server
-        if [ -d pantasks ]; then (cd pantasks && make $@); fi
+        if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
 
 $(PROGRAM) $(LIBS) $(EXTRAS):
-        if [ -d "$@" ]; then (cd $@ && make); fi
+        if [ -d "$@" ]; then (cd $@ && $(MAKE)); fi
 
 %.install:
-        if [ -d "$*" ]; then make $*; fi
-        if [ -d "$*" ]; then (cd $* && make install); fi
+        if [ -d "$*" ]; then $(MAKE) $*; fi
+        if [ -d "$*" ]; then (cd $* && $(MAKE) install); fi
 
 %.clean:
-        if [ -d "$*" ]; then (cd $* && make clean); fi
+        if [ -d "$*" ]; then (cd $* && $(MAKE) clean); fi
 
 %.dist:
-        if [ -d "$*" ]; then (cd $* && make dist); fi
+        if [ -d "$*" ]; then (cd $* && $(MAKE) dist); fi
 
 %.uninstall:
-        if [ -d "$*" ]; then (cd $* && make uninstall); fi
+        if [ -d "$*" ]; then (cd $* && $(MAKE) uninstall); fi
 
 .PHONY: $(PROGRAM) $(LIBS) pantasks_server pantasks_client

branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.data/init.c

@@ -137 +137 @@
 int zap              PROTO((int, char **));
 int zplot            PROTO((int, char **));
+int zcplot            PROTO((int, char **));
 
 static Command cmds[] = {  
@@ -284 +285 @@
   {1, "zap",          zap,              "assign values to pixel regions"},
   {1, "zplot",        zplot,            "plot x y with size scaled by z"},
+  {1, "zcplot",       zcplot,           "plot x y with color scaled by z"},
 }; 
 

branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -2 +2 @@
 
 FILE *f = (FILE *) NULL;
-char filename[1024];
+char filename[2048];
 
 int datafile (int argc, char **argv) {
@@ -84 +84 @@
     colstr = argv[2*i+2];
     for (j = 0; j < strlen (colstr); j++) {
-      if (!isdigit(colstr[j])) {
-        gprint (GP_ERR, "USAGE: read name N name N ...\n");
-        free (vec);
-        free (col);
-        return (FALSE);    
-      }
-    }
-    col[i] = atof (colstr);
+      if (isdigit(colstr[j])) {
+        col[i] = atof (colstr);
+        continue;
+      }
+      // allow 'excel' columns names of the form A-Z, AA-AZ, BA-BZ, .. ZA-ZZ
+      if (strlen(colstr) >= 3) goto bad_colname;
+      if (colstr[0] < 'A') goto bad_colname;
+      if (colstr[0] > 'Z') goto bad_colname;
+      if (colstr[1] && colstr[1] < 'A') goto bad_colname;
+      if (colstr[1] && colstr[1] > 'Z') goto bad_colname;
+
+      col[i] = colstr[0] - 'A' + 1;
+      if (colstr[1]) {
+        col[i] *= 26;
+        col[i] += colstr[1] - 'A' + 1;
+      }
+      continue;
+
+    bad_colname:
+      gprint (GP_ERR, "USAGE: read name N name N ...\n");
+      free (vec);
+      free (col);
+      return (FALSE);    
+    }
   }
 
@@ -105 +121 @@
     scan_line (f, buffer);
   }
+
+  int Nfield = 0;
+  int Nline = 0;
 
   Nstart = 0;
@@ -139 +158 @@
           }
           vec[i][0].elements.Flt[N] = value;
+          if (status) {
+              Nfield ++;
+          }
           if (!status) vec[i][0].elements.Flt[N] = NAN;
         }
         if (status) N++;
       }
+      Nline ++;
+      if (c1) {
+          // fprintf (stderr, "line %d, chars %ld, fields %d\n", Nline, (c1 - c0), Nfield);
+      }
+      Nfield = 0;
       c0 = c1 + 1;
       if (N == NELEM) {

branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.data/tvcolors.c

@@ -5 +5 @@
   int N, kapa;
   char *name;
-  KapaImageData data;
+  // KapaImageData data;
 
   name = NULL;
@@ -13 +13 @@
     remove_argument (N, &argc, argv);
   }
-  if (!GetImage (&data, &kapa, name)) return (FALSE);
+  if (!GetGraph (NULL, &kapa, name)) return (FALSE);
   FREE (name);
 

branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.data/zplot.c

@@ -58 +58 @@
 }
 
+int zcplot (int argc, char **argv) {
+  
+  int i, kapa;
+  opihi_flt *out;
+  double min, range;
+  Graphdata graphmode;
+  Vector *xvec, *yvec, *zvec, Zvec;
 
+  if (!style_args (&graphmode, &argc, argv, &kapa)) return (FALSE);
+
+  if (argc != 6) {
+    gprint (GP_ERR, "USAGE: zplot <x> <y> <z> min max\n");
+    return (FALSE);
+  }
+
+  min = atof(argv[4]);
+  range = atof(argv[5]) - min;
+
+  /* find vectors */
+  if ((xvec = SelectVector (argv[1], OLDVECTOR, TRUE)) == NULL) return (FALSE);
+  if ((yvec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return (FALSE);
+  if ((zvec = SelectVector (argv[3], OLDVECTOR, TRUE)) == NULL) return (FALSE);
+  if (xvec[0].Nelements != yvec[0].Nelements) {
+    gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[1], argv[2]);
+    return (FALSE);
+  }
+  if (xvec[0].Nelements != zvec[0].Nelements) {
+    gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[1], argv[3]);
+    return (FALSE);
+  }
+  SetVector (&Zvec, OPIHI_FLT, zvec[0].Nelements);
+  out = Zvec.elements.Flt;
+ 
+  if (zvec[0].type == OPIHI_FLT) {
+    opihi_flt *in = zvec[0].elements.Flt;
+    for (i = 0; i < Zvec.Nelements; i++, in++, out++) {
+      *out = MIN (1.0, MAX (0.01, (*in - min) / range));
+    }
+  } else {
+    opihi_int *in = zvec[0].elements.Int;
+    for (i = 0; i < Zvec.Nelements; i++, in++, out++) {
+      *out = MIN (1.0, MAX (0.01, (*in - min) / range));
+    }
+  }
+
+  /* point size determined by Zvec */
+  graphmode.style = 2; /* plot points */
+  graphmode.color = -1; /* point color determined by Zvec */
+  graphmode.etype = 0; /* no errorbars */
+  PlotVectorTriplet (kapa, xvec, yvec, &Zvec, &graphmode);
+
+  free (Zvec.elements.Ptr);
+
+  return (TRUE);
+
+}
+
+