Changeset 38234

Timestamp:

May 6, 2015, 6:15:15 AM (11 years ago)

Author:

eugene

Message:

add mslice

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (2 diffs)
• mslice.c (added)
• rd.c (modified) (1 diff)

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

@@ -91 +91 @@
 $(SRC)/mget.$(ARCH).o           \
 $(SRC)/mget3d.$(ARCH).o         \
+$(SRC)/mslice.$(ARCH).o         \
 $(SRC)/minterpolate.$(ARCH).o   \
 $(SRC)/medimage.$(ARCH).o       \

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

@@ -82 +82 @@
 int mget             PROTO((int, char **));
 int mget3d           PROTO((int, char **));
+int mslice           PROTO((int, char **));
 int minterp          PROTO((int, char **));
 int medimage_command PROTO((int, char **));
@@ -248 +249 @@
   {1, "mget",         mget,             "extract a vector from an image"},
   {1, "mget3d",       mget3d,           "extract a vector from a 3D image"},
+  {1, "mslice",       mslice,           "extract an image plane from a 3D image"},
   {1, "imget",        mget,             "extract a vector from an image"},
   {1, "minterp",      minterp,          "interpolate image pixels"},

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

@@ -170 +170 @@
   if (plane >= 0) {
     // we are requesting a specific plane (-1 : all data)
-    int tooFar = Nz ? (plane >= Nz) : (plane > Nz);
+    int tooFar = (Nz > 0) ? (plane >= Nz) : (plane > 0);
     if (tooFar) {
       gprint (GP_ERR, "-plane is too large: %d total planes\n", Nz);