SCM Repository

[diderot] Diff of /branches/vis12/src/dnorm/dnorm.c

[diderot] / branches / vis12 / src / dnorm / dnorm.c

Diff of /branches/vis12/src/dnorm/dnorm.c

-revision 1876, Wed May 16 23:48:23 2012 UTC
+revision 1877, Fri May 18 09:03:40 2012 UTC
 Line 43
    char *err;
    Nrrd *nin, *nout;
    NrrdIoState *nio;
-   int kindIn, kindOut, headerOnly, haveMM, trivialOrient;
+   int kindIn, kindOut, headerOnly, haveMM, trivialOrient, recenter;
    unsigned int kindAxis, axi, si, sj;
+   double sscl;
    me = argv[0];
    mop = airMopNew();
-Line 58
+Line 59
               "even if the input nrrd comes with full orientation or "
               "per-axis min-max info, ignore it and instead assert the "
               "most trivial mapping between index and world space");
+   hestOptAdd(&hopt, "c", NULL, airTypeInt, 0, 0, &recenter, NULL,
+              "re-locate output spaceOrigin so that field is centered "
+              "around origin of space coordinates");
+   hestOptAdd(&hopt, "s", "scl", airTypeDouble, 1, 1, &sscl, "1.0",
+              "when contriving orientation information, distance between "
+              "samples to use");
    hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &nin, NULL,
               "input image", NULL, NULL, nrrdHestNrrd);
    hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, "-",
-Line 204
+Line 211
          if (!nrrdSpaceVecExists(nout->spaceDim,
                                  nout->axis[axi].spaceDirection)) {
            nrrdSpaceVecSetZero(nout->axis[axi].spaceDirection);
-           nout->axis[axi].spaceDirection[saxi] = 1.0;
+           nout->axis[axi].spaceDirection[saxi] = sscl;
          }
          saxi++;
        } else {
-Line 236
+Line 243
          nout->axis[axi].spaceDirection[saxi]
            = (AIR_EXISTS(nin->axis[axi].spacing)
               ? nin->axis[axi].spacing
-              : 1.0);
+              : sscl);
          saxi++;
        } else {
          nrrdSpaceVecSetNaN(nout->axis[axi].spaceDirection);
-Line 255
+Line 262
      airMopError(mop); exit(1);
    }
+   if (recenter) {
+     /* sets field's origin so field is centered on the origin. capiche? */
+     /* this code was tacked on later than the stuff above, so its
+        logic could probably be moved up there, but it seems cleaner to
+        have it as a separate post-process */
+     double mean[NRRD_SPACE_DIM_MAX];
+     nrrdSpaceVecSetZero(mean);
+     for (axi=0; axi<nout->dim; axi++) {
+       if (nrrdKindUnknown == kindOut || kindAxis != axi) {
+         nrrdSpaceVecScaleAdd2(mean, 1.0, mean,
+.5*(nout->axis[axi].size - 1),
+                               nout->axis[axi].spaceDirection);
+       }
+     }
+     nrrdSpaceVecScaleAdd2(mean, 1.0, mean,
+.0, nout->spaceOrigin);
+     /* now mean is the center of the field */
+     nrrdSpaceVecScaleAdd2(nout->spaceOrigin,
+.0, nout->spaceOrigin,
+                           -1.0, mean);
+   }
    if (nrrdSave(outS, nout, nio)) {
      airMopAdd(mop, err = biffGet(NRRD), airFree, airMopAlways);
      fprintf(stderr, "%s: trouble saving \"%s\":\n%s",

 Legend:



Removed from v.1876
 


changed lines


 
Added in v.1877
 Legend:



Removed from v.1876
 


changed lines


 
Added in v.1877
-Removed from v.1876
+Added in v.1877

root@smlnj-gforge.cs.uchicago.edu	ViewVC Help
Powered by ViewVC 1.0.0