[Teem-commit] SF.net SVN: teem:[6000] teem/trunk/src/bin

[<kin...@us...>]

Revision: 6000
          http://sourceforge.net/p/teem/code/6000
Author:   kindlmann
Date:     2013-07-27 07:37:19 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
using -zz to enable gageParmTwoDimZeroZ

Modified Paths:
--------------
    teem/trunk/src/bin/gprobe.c
    teem/trunk/src/bin/vprobe.c

Modified: teem/trunk/src/bin/gprobe.c
===================================================================
--- teem/trunk/src/bin/gprobe.c	2013-07-27 07:36:24 UTC (rev 5999)
+++ teem/trunk/src/bin/gprobe.c	2013-07-27 07:37:19 UTC (rev 6000)
@@ -222,7 +222,7 @@
   hestParm *hparm;
   hestOpt *hopt = NULL;
   NrrdKernelSpec *k00, *k11, *k22, *kSS, *kSSblur;
-  int what, E=0, renorm, uniformSS, optimSS, verbose,
+  int what, E=0, renorm, uniformSS, optimSS, verbose, zeroZ,
     orientationFromSpacing, probeSpaceIndex, normdSS;
   unsigned int iBaseDim, oBaseDim, axi, numSS, seed;
   const double *answer;
@@ -290,6 +290,9 @@
              "RNG seed; mostly for debugging");
   hestOptAdd(&hopt, "c", "bool", airTypeBool, 1, 1, &clamp, "false",
              "clamp positions as part of probing");
+  hestOptAdd(&hopt, "zz", "bool", airTypeBool, 1, 1, &zeroZ, "false",
+             "enable \"zeroZ\" behavior in gage that partially "
+             "implements working with 3D images as if they are 2D");
 
   hestOptAdd(&hopt, "k00", "kern00", airTypeOther, 1, 1, &k00,
              "tent", "kernel for gageKernel00",
@@ -409,11 +412,11 @@
 
     sbp = gageStackBlurParmNew();
     airMopAdd(mop, sbp, (airMopper)gageStackBlurParmNix, airMopAlways);
-    if (gageStackBlurParmScaleSet(sbp, numSS, rangeSS[0], rangeSS[1],
-                                  uniformSS, optimSS)
+    if (gageStackBlurParmVerboseSet(sbp, verbose)
+        || gageStackBlurParmScaleSet(sbp, numSS, rangeSS[0], rangeSS[1],
+                                     uniformSS, optimSS)
         || gageStackBlurParmKernelSet(sbp, kSSblur, AIR_TRUE)
         || gageStackBlurParmBoundarySet(sbp, nrrdBoundaryBleed, AIR_NAN)
-        || gageStackBlurParmVerboseSet(sbp, verbose)
         || gageStackBlurManage(&ninSS, &recompute, sbp,
                                stackFnameFormat, AIR_TRUE, NULL,
                                nin, kind)) {
@@ -443,6 +446,7 @@
   airMopAdd(mop, ctx, AIR_CAST(airMopper, gageContextNix), airMopAlways);
   gageParmSet(ctx, gageParmGradMagCurvMin, gmc);
   gageParmSet(ctx, gageParmVerbose, verbose);
+  gageParmSet(ctx, gageParmTwoDimZeroZ, zeroZ);
   gageParmSet(ctx, gageParmRenormalize, renorm ? AIR_TRUE : AIR_FALSE);
   gageParmSet(ctx, gageParmCheckIntegrals, AIR_TRUE);
   gageParmSet(ctx, gageParmOrientationFromSpacing, orientationFromSpacing);

Modified: teem/trunk/src/bin/vprobe.c
===================================================================
--- teem/trunk/src/bin/vprobe.c	2013-07-27 07:36:24 UTC (rev 5999)
+++ teem/trunk/src/bin/vprobe.c	2013-07-27 07:37:19 UTC (rev 6000)
@@ -46,7 +46,7 @@
   hestParm *hparm;
   hestOpt *hopt = NULL;
   NrrdKernelSpec *k00, *k11, *k22, *kSS, *kSSblur;
-  int what, E=0, renorm, SSuniform, SSoptim, verbose,
+  int what, E=0, renorm, SSuniform, SSoptim, verbose, zeroZ,
     orientationFromSpacing, SSnormd;
   unsigned int iBaseDim, oBaseDim, axi, numSS, ninSSIdx, seed;
   const double *answer;
@@ -122,6 +122,9 @@
              NULL, NULL, nrrdHestKernelSpec);
   hestOptAdd(&hopt, "seed", "N", airTypeUInt, 1, 1, &seed, "42",
              "RNG seed; mostly for debugging");
+  hestOptAdd(&hopt, "zz", "bool", airTypeBool, 1, 1, &zeroZ, "false",
+             "enable \"zeroZ\" behavior in gage that partially "
+             "implements working with 3D images as if they are 2D");
 
   hestOptAdd(&hopt, "ssn", "SS #", airTypeUInt, 1, 1, &numSS,
              "0", "how many scale-space samples to evaluate, or, "
@@ -298,6 +301,7 @@
   airMopAdd(mop, ctx, AIR_CAST(airMopper, gageContextNix), airMopAlways);
   gageParmSet(ctx, gageParmGradMagCurvMin, gmc);
   gageParmSet(ctx, gageParmVerbose, verbose);
+  gageParmSet(ctx, gageParmTwoDimZeroZ, zeroZ);
   gageParmSet(ctx, gageParmRenormalize, renorm ? AIR_TRUE : AIR_FALSE);
   gageParmSet(ctx, gageParmCheckIntegrals, AIR_TRUE);
   gageParmSet(ctx, gageParmOrientationFromSpacing, orientationFromSpacing);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.