Changeset 25757 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Oct 2, 2009, 3:15:42 PM (17 years ago)

Author:

eugene

Message:

various dvo and other improvements from gene@dev branch

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (4 diffs)
• init.c (modified) (4 diffs)
• relocate.c (copied) (copied from branches/eam_branches/20090715/Ohana/src/opihi/cmd.data/relocate.c )
• subset.c (modified) (3 diffs)
• tvcolors.c (modified) (1 diff)
• vellipse.c (copied) (copied from branches/eam_branches/20090715/Ohana/src/opihi/cmd.data/vellipse.c )
• vgroup.c (copied) (copied from branches/eam_branches/20090715/Ohana/src/opihi/cmd.data/vgroup.c )

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -97 +97 @@
 $(SRC)/rebin.$(ARCH).o          \
 $(SRC)/resize.$(ARCH).o \
+$(SRC)/relocate.$(ARCH).o       \
 $(SRC)/roll.$(ARCH).o           \
 $(SRC)/rotate.$(ARCH).o \
@@ -110 +111 @@
 $(SRC)/style.$(ARCH).o             \
 $(SRC)/subraster.$(ARCH).o         \
-$(SRC)/subset.$(ARCH).o    \
+$(SRC)/subset.$(ARCH).o            \
 $(SRC)/svd.$(ARCH).o               \
 $(SRC)/swapbytes.$(ARCH).o         \
@@ -118 +119 @@
 $(SRC)/tvcolors.$(ARCH).o          \
 $(SRC)/tvcontour.$(ARCH).o         \
-$(SRC)/tvgrid.$(ARCH).o    \
+$(SRC)/tvgrid.$(ARCH).o            \
 $(SRC)/uniq.$(ARCH).o              \
-$(SRC)/unsign.$(ARCH).o    \
+$(SRC)/unsign.$(ARCH).o            \
 $(SRC)/vbin.$(ARCH).o              \
+$(SRC)/vgroup.$(ARCH).o            \
 $(SRC)/vclip.$(ARCH).o             \
-$(SRC)/vgauss.$(ARCH).o           \
-$(SRC)/vmaxwell.$(ARCH).o           \
+$(SRC)/vgauss.$(ARCH).o            \
+$(SRC)/vellipse.$(ARCH).o          \
+$(SRC)/vmaxwell.$(ARCH).o          \
 $(SRC)/vgrid.$(ARCH).o             \
 $(SRC)/vload.$(ARCH).o             \
@@ -130 +133 @@
 $(SRC)/vpop.$(ARCH).o              \
 $(SRC)/vroll.$(ARCH).o             \
-$(SRC)/vsmooth.$(ARCH).o        \
+$(SRC)/vsmooth.$(ARCH).o           \
 $(SRC)/vstats.$(ARCH).o            \
 $(SRC)/wd.$(ARCH).o                \

trunk/Ohana/src/opihi/cmd.data/init.c

@@ -85 +85 @@
 int rebin            PROTO((int, char **));
 int resize           PROTO((int, char **));
+int relocate         PROTO((int, char **));
 int roll             PROTO((int, char **));
 int rotate           PROTO((int, char **));
@@ -110 +111 @@
 int unsign           PROTO((int, char **));
 int vbin             PROTO((int, char **));
+int vgroup           PROTO((int, char **));
 int vclip            PROTO((int, char **));
 int vect_select      PROTO((int, char **));
 int vgrid            PROTO((int, char **));
 int vgauss           PROTO((int, char **));
+int vellipse         PROTO((int, char **));
 int vmaxwell         PROTO((int, char **));
 int vload            PROTO((int, char **));
@@ -218 +221 @@
   {1, "rebin",        rebin,            "rebin image data by factor of N"},
   {1, "resize",       resize,           "set graphics/image window size"},
+  {1, "relocate",     relocate,         "set graphics/image window position"},
   {1, "roll",         roll,             "roll image to new start point"},
   {1, "rotate",       rotate,           "rotate image"},
@@ -243 +247 @@
   {1, "uniq",         uniq,             "create a uniq vector subset from a vector"},
   {1, "unsign",       unsign,           "toggle the UNSIGN status"},
-  {1, "vbin",         vbin,             "rebin vector data by a fector of N"},
+  {1, "vbin",         vbin,             "rebin vector data by a factor of N"},
+  {1, "vgroup",       vgroup,           "group y vector into bins defined by x vector values"},
   {1, "vclip",        vclip,            "clip values in a vector to be within a range"},
   {1, "vectors",      list_vectors,     "list vectors"},
   {1, "vgauss",       vgauss,           "fit a Gaussian to a vector"},
+  {1, "vellipse",     vellipse,         "fit a Ellipse to a vector pair"},
   {1, "vgrid",        vgrid,            "generate an image from a triplet of vectors"},
   {1, "vhistogram",   histogram,        "generate histogram from vector"},

trunk/Ohana/src/opihi/cmd.data/subset.c

@@ -6 +6 @@
   
   char *out;
-  int  i, Npts, size;
+  int  i, Npts, size, valid;
   Vector *ivec, *ovec, *tvec;
 
@@ -12 +12 @@
   ivec = ovec = tvec = NULL;
 
-  if ((argc < 6) || strcmp(argv[2], "=") || strcmp (argv[4], "if")) {
-    gprint (GP_ERR, "SYNTAX: subset vec = vec if (logic expression)\n");
+  valid = TRUE;
+  valid &= (argc >= 6);
+  valid &= !strcmp(argv[2], "=");
+  valid &= !strcmp(argv[4], "if") || !strcmp (argv[4], "where");
+  if (!valid) {
+    gprint (GP_ERR, "SYNTAX: subset vec = vec [if/where] (logic expression)\n");
     return (FALSE);
   }
@@ -76 +80 @@
   return (TRUE);
 
- error:
+error:
   DeleteVector (tvec);
   DeleteVector (ovec);

trunk/Ohana/src/opihi/cmd.data/tvcolors.c

@@ -19 +19 @@
   if (argc != 2) {
     gprint (GP_ERR, "USAGE: tvcolors (colormap)\n");
+    gprint (GP_ERR, " colormap options : greyscale, -greyscale, rainbow, heat, fullcolor, ruffcolor (also grayscale, -grayscale)\n");
     return (FALSE);
   }