Changeset 42305

Timestamp:

Nov 14, 2022, 8:33:33 PM (4 years ago)

Author:

eugene

Message:

add option to get box size in pixels; add function to get vector/matrix sizes

Location:

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (2 diffs)
• limits.c (modified) (3 diffs)
• opihi_size.c (added)
• reindex.c (modified) (1 diff)

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/Makefile

@@ -154 +154 @@
 $(SRC)/set.$(ARCH).o            \
 $(SRC)/shift.$(ARCH).o          \
+$(SRC)/opihi_size.$(ARCH).o        \
 $(SRC)/sort.$(ARCH).o           \
 $(SRC)/spline.$(ARCH).o         \

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

@@ -160 +160 @@
 int tvgrid           PROTO((int, char **));
 int opihi_type       PROTO((int, char **));
+int opihi_size       PROTO((int, char **));
 int uniq             PROTO((int, char **));
 int uniqpair         PROTO((int, char **));
@@ -350 +351 @@
   {1, "set",          set,              "image and vector math"},
   {1, "shift",        shift,            "shift data in an image"},
+  {1, "size",         opihi_size,       "get vector/matrix dimension/size information"},
   {1, "sort",         sort_vectors,     "sort list of vectors"},
   {1, "spline",       spline_command,   "shift data in an image"},

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/limits.c

@@ -61 +61 @@
     APPLY = TRUE;
   }
+
   char *name = NULL;
   if ((N = get_argument (argc, argv, "-n"))) {
@@ -67 +68 @@
     remove_argument (N, &argc, argv);
   }
-
   if (!GetGraph (&graphmode, &kapa, name)) return (FALSE);
   FREE (name);
+
+  // this is not super intuitive
+  if ((N = get_argument (argc, argv, "-boxsize"))) {
+    remove_argument (N, &argc, argv);
+    float dx, dy;
+    // ask kapa for the size of the graph region in pixels
+    KapaGetLimits (kapa, &dx, &dy);
+    set_variable ("KAPA_XPIX", fabs(dx));
+    set_variable ("KAPA_YPIX", fabs(dy));
+  }
 
   // XXX need an option to set the limits based on the current image bounds
@@ -169 +179 @@
   return (TRUE);
 }
+
+/* -minX value : the minimum X axis value will be no higher than this value
+   -maxX value : the maximum X axis value will be no lower than this value
+   -delX value : the range of the X axis will be at least this value
+
+   These can be used to prevent the range from collapsing.  
+   These are only used if the -a option is supplied, otherwise the supplied or auto-calculated 
+   ranges are used (this seems like an poor choice)
+
+*/
+
+
+   

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/reindex.c

@@ -72 +72 @@
     }
   }
+  if (ivec->type == OPIHI_STR) {
+    opihi_int *vx = xvec[0].elements.Int;
+    for (Npts = i = 0; i < xvec[0].Nelements; i++, vx++) {
+      if (Npts >= NPTS) {
+        NPTS += 2000;
+        REALLOCATE (ovec[0].elements.Str, char *, NPTS);
+      }
+      if (*vx < 0) {
+        if (KEEP_UNMATCH) {
+          ovec[0].elements.Str[Npts] = strcreate(""); // XXX use a different or a specified value?
+          Npts++;
+        } 
+        continue;
+      }
+      if (*vx > Nmax) ESCAPE("unexpected value in index: "OPIHI_INT_FMT" (%d)\n", *vx, i);
+      ovec[0].elements.Str[Npts] = strcreate(ivec->elements.Str[*vx]);
+      Npts++;
+    }
+  }
 
   // free up unused memory