SCM Repository

[diderot] Diff of /trunk/src/dnorm/dnorm.c

[diderot] / trunk / src / dnorm / dnorm.c

Diff of /trunk/src/dnorm/dnorm.c

-revision 114, Wed Jun 23 19:39:36 2010 UTC
+revision 1116, Thu May  5 04:49:02 2011 UTC
 Line 42
    char *err;
    Nrrd *nin, *nout;
    NrrdIoState *nio;
-   int kindIn, kindOut;
+   int kindIn, kindOut, headerOnly, haveMM;
    unsigned int kindAxis, axi, si, sj;
    me = argv[0];
 Line 50
    hparm = hestParmNew();
    hopt = NULL;
    airMopAdd(mop, hparm, (airMopper)hestParmFree, airMopAlways);
+   hestOptAdd(&hopt, "h,header", NULL, airTypeInt, 0, 0, &headerOnly, NULL,
+              "output header of nrrd file only, not the data itself");
    hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &nin, NULL,
               "input image", NULL, NULL, nrrdHestNrrd);
    hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, "-",
-Line 69
+Line 71
    /* make sure all kinds are set to something */
    /* see if there's a range kind, verify that there's only one */
+   /* set haveMM */
+   haveMM = AIR_TRUE;
    kindIn = nrrdKindUnknown;
    kindAxis = 0;
    for (axi=0; axi<nin->dim; axi++) {
      if (nrrdKindUnknown == nin->axis[axi].kind
          || nrrdKindIsDomain(nin->axis[axi].kind)) {
-       continue;
+       haveMM &= AIR_EXISTS(nin->axis[axi].min);
-     }
+       haveMM &= AIR_EXISTS(nin->axis[axi].max);
+     } else {
      if (nrrdKindUnknown != kindIn) {
        fprintf(stderr, "%s: got non-domain kind %s on axis %u, but already "
                "have %s from axis %u\n", me,
-Line 86
+Line 91
      kindIn = nin->axis[axi].kind;
      kindAxis = axi;
    }
+   }
    /* see if the non-domain kind is something we can interpret as a tensor */
    if (nrrdKindUnknown != kindIn) {
      switch (kindIn) {
-Line 118
+Line 124
      kindOut = nrrdKindUnknown;
    }
-   /* prepare output (this may eventually be cropping or something else) */
+   /* initialize output by copying */
    nout = nrrdNew();
    airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
    if (nrrdCopy(nout, nin)) {
      airMopAdd(mop, err = biffGet(NRRD), airFree, airMopAlways);
      fprintf(stderr, "%s: trouble copying:\n%s", me, err);
      airMopError(mop); exit(1);
    }
    /* no comments, either advertising the format URL or anything else */
    nio = nrrdIoStateNew();
    airMopAdd(mop, nio, (airMopper)nrrdIoStateNix, airMopAlways);
    nio->skipFormatURL = AIR_TRUE;
+   if (headerOnly) {
+     nio->skipData = AIR_TRUE;
+   }
    nrrdCommentClear(nout);
    /* no measurement frame */
-Line 180
+Line 188
    */
    if (nout->spaceDim) {
      int saxi = 0;
+     /* we use only the space dimension, not any named space */
+     nout->space = nrrdSpaceUnknown;
      if (!nrrdSpaceVecExists(nout->spaceDim, nout->spaceOrigin)) {
        nrrdSpaceVecSetZero(nout->spaceOrigin);
      }
-Line 195
+Line 205
          nrrdSpaceVecSetNaN(nout->axis[axi].spaceDirection);
        }
      }
+   } else if (haveMM) {
+     int saxi = 0;
+     for (axi=0; axi<nout->dim; axi++) {
+       if (nrrdKindUnknown == kindOut || kindAxis != axi) {
+         nrrdSpaceVecSetZero(nout->axis[axi].spaceDirection);
+         nout->axis[axi].spaceDirection[saxi]
+           = (nin->axis[axi].max - nin->axis[axi].min)/(nin->axis[axi].size-1);
+         nout->spaceOrigin[saxi] = nin->axis[axi].min;
+         saxi++;
+       } else {
+         nrrdSpaceVecSetNaN(nout->axis[axi].spaceDirection);
+       }
+     }
+     nout->spaceDim = saxi;
    } else {
      int saxi = 0;
      nrrdSpaceVecSetZero(nout->spaceOrigin);
      for (axi=0; axi<nout->dim; axi++) {
        if (nrrdKindUnknown == kindOut || kindAxis != axi) {
          nrrdSpaceVecSetZero(nout->axis[axi].spaceDirection);
-         nout->axis[axi].spaceDirection[saxi] = 1.0;
+         nout->axis[axi].spaceDirection[saxi]
+           = (AIR_EXISTS(nin->axis[axi].spacing)
+              ? nin->axis[axi].spacing
+              : 1.0);
          saxi++;
        } else {
          nrrdSpaceVecSetNaN(nout->axis[axi].spaceDirection);
-Line 209
+Line 236
      }
      nout->spaceDim = saxi;
    }
-   /* probably should be asserted earlier */
+   /* space dimension has to match the number of domain axes */
    if (nout->dim != nout->spaceDim + !!kindOut) {
      fprintf(stderr, "%s: output dim %d != spaceDim %d + %d %s%s%s\n",
              me, nout->dim, nout->spaceDim, !!kindOut,

 Legend:



Removed from v.114
 


changed lines


 
Added in v.1116
 Legend:



Removed from v.114
 


changed lines


 
Added in v.1116
-Removed from v.114
+Added in v.1116

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