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

Timestamp:

Jun 12, 2015, 10:26:46 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• bisection.c (copied) (copied from branches/eam_branches/ipp-20150419/Ohana/src/opihi/cmd.data/bisection.c )
• init.c (modified) (3 diffs)
• tvcolors.c (modified) (1 diff)

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

@@ -25 +25 @@
 $(SRC)/book.$(ARCH).o           \
 $(SRC)/book_commands.$(ARCH).o  \
+$(SRC)/bisection.$(ARCH).o              \
 $(SRC)/cast.$(ARCH).o           \
 $(SRC)/center.$(ARCH).o \

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

@@ -9 +9 @@
 int box              PROTO((int, char **));
 int book_command     PROTO((int, char **));
+int bisection        PROTO((int, char **));
 int center           PROTO((int, char **));
-int parity           PROTO((int, char **));
 int cast             PROTO((int, char **));
 int circstats        PROTO((int, char **));
@@ -90 +90 @@
 int plot             PROTO((int, char **));
 int dot              PROTO((int, char **));
+int parity           PROTO((int, char **));
 int point            PROTO((int, char **));
 int ps               PROTO((int, char **));
@@ -176 +177 @@
   {1, "applyfit2d",   applyfit2d,       "apply 2-d fit to new vector"},
   {1, "applyfit3d",   applyfit3d,       "apply 3-d fit to new vector"},
+  {1, "bisection",    bisection,        "use bisection to find threshold in vector"},
   {1, "book",         book_command,     "commands to manipulate book/page/word data"},
   {1, "box",          box,              "draw a box on the plot"},

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

@@ -16 +16 @@
   FREE (name);
 
+  int SetNAN = FALSE;
+  int red, green, blue;
+  if ((N = get_argument (argc, argv, "-nan"))) {
+    if (N > argc - 4) { 
+      gprint (GP_ERR, "ERROR: -nan (red) (green) (blue) does not have enough arguments\n"); 
+      return FALSE; 
+    }
+    remove_argument (N, &argc, argv);
+    red = strtol (argv[N], NULL, 0);
+    remove_argument (N, &argc, argv);
+    green = strtol (argv[N], NULL, 0);
+    remove_argument (N, &argc, argv);
+    blue = strtol (argv[N], NULL, 0);
+    remove_argument (N, &argc, argv);
+    SetNAN = TRUE;
+  }
+
   // use the currently-set zero,range values if not supplied
-  if (argc != 2) {
-    gprint (GP_ERR, "USAGE: tvcolors (colormap)\n");
+  if (!SetNAN && (argc != 2)) {
+    gprint (GP_ERR, "USAGE: tvcolors (colormap) [-nan red green blue]\n");
     gprint (GP_ERR, " colormap options : greyscale, -greyscale, rainbow, heat, fullcolor, ruffcolor (also grayscale, -grayscale)\n");
     return (FALSE);
   }
 
-  KiiSetColormap (kapa, argv[1]);
+  if (SetNAN) {
+    KiiSetNanColor (kapa, red, green, blue);
+  }
+  if (argc == 2) {
+    KiiSetColormap (kapa, argv[1]);
+  }
   return (TRUE);
 }