[Teem-commit] teem/src/bin mrender.c,1.31,1.32

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

Update of /cvsroot/teem/teem/src/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv406

Modified Files:
	mrender.c 
Log Message:
debugging rendering of tensors

Index: mrender.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/mrender.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mrender.c	19 Feb 2004 07:11:12 -0000	1.31
--- mrender.c	19 Feb 2004 11:15:13 -0000	1.32
***************
*** 80,83 ****
--- 80,84 ----
    Nrrd *nin;            /* input volume to render */
    gageKind *kind;       /* the kind of volume it is */
+   int verbPixel[2];     /* which pixel to do verbose stuff on */
    double rayStep,       /* distance between sampling planes */
      fromNaN;            /* what to convert non-existent value to */
***************
*** 320,323 ****
--- 321,331 ----
    tt->ui = uIndex;
    tt->vi = vIndex;
+   if (!( -1 == uu->verbPixel[0] && -1 == uu->verbPixel[1] )) {
+     if (uIndex == uu->verbPixel[0] && vIndex == uu->verbPixel[1]) {
+       gageParmSet(uu->gctx0, gageParmVerbose, AIR_TRUE);
+     } else {
+       gageParmSet(uu->gctx0, gageParmVerbose, AIR_FALSE);
+     }
+   }
    tt->rayLen = rayLen;
    tt->rayStep = (uu->rayStep*tt->rayLen /
***************
*** 434,438 ****
    hestOpt *hopt=NULL;
    hestParm *hparm;
!   int E, Ecode, renorm;
    char *me, *errS, *whatS;
    mrendUser *uu;
--- 442,446 ----
    hestOpt *hopt=NULL;
    hestParm *hparm;
!   int E, Ecode, renorm, base;
    char *me, *errS, *whatS;
    mrendUser *uu;
***************
*** 493,496 ****
--- 501,507 ----
  	     &(uu->hctx->numThreads),
  	     "1", "number of threads hoover should use");
+   hestOptAdd(&hopt, "vp", "img coords", airTypeInt, 2, 2, &(uu->verbPixel),
+ 	     "-1 -1", "pixel coordinates for which to turn on all verbose "
+ 	     "debugging messages, or \"-1 -1\" to disable this.");
    hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &(uu->outS),
  	     NULL, "file to write output nrrd to");
***************
*** 526,536 ****
    
    /* set remaining fields of hoover context */
!   nrrdAxisInfoGet_nva(uu->nin, nrrdAxisInfoSize, uu->hctx->volSize);
!   nrrdAxisInfoGet_nva(uu->nin, nrrdAxisInfoSpacing, uu->hctx->volSpacing);
!   if (nrrdCenterUnknown != uu->nin->axis[0].center) {
!     uu->hctx->volCentering = uu->nin->axis[0].center;
      fprintf(stderr, "%s: setting volCentering to %s\n", me,
! 	    airEnumStr(nrrdCenter, uu->nin->axis[0].center));
    }
    /* this is reasonable for now */
    uu->hctx->imgCentering = nrrdCenterCell;
--- 537,554 ----
    
    /* set remaining fields of hoover context */
!   base = uu->kind->baseDim;
!   uu->hctx->volSize[0] = uu->nin->axis[base+0].size;
!   uu->hctx->volSize[1] = uu->nin->axis[base+1].size;
!   uu->hctx->volSize[2] = uu->nin->axis[base+2].size;
!   uu->hctx->volSpacing[0] = uu->nin->axis[base+0].spacing;
!   uu->hctx->volSpacing[1] = uu->nin->axis[base+1].spacing;
!   uu->hctx->volSpacing[2] = uu->nin->axis[base+2].spacing;
!   if (nrrdCenterUnknown != uu->nin->axis[base].center) {
!     uu->hctx->volCentering = uu->nin->axis[base].center;
      fprintf(stderr, "%s: setting volCentering to %s\n", me,
! 	    airEnumStr(nrrdCenter, uu->nin->axis[base].center));
    }
+   fprintf(stderr, "!%s: uu->hctx->volCentering = %d\n",
+ 	  me, uu->hctx->volCentering);
    /* this is reasonable for now */
    uu->hctx->imgCentering = nrrdCenterCell;