[Teem-commit] teem/src/bin qbert.c,1.18,1.19

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

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

Modified Files:
	qbert.c 
Log Message:
qbert now defaults to three-channel VGH, instead of two-channel BG

Index: qbert.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/qbert.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** qbert.c	7 Jan 2004 15:34:28 -0000	1.18
--- qbert.c	9 Feb 2004 07:21:14 -0000	1.19
***************
*** 528,532 ****
    char *me, *outS, *errS;
    Nrrd *nin, *npad, *nrsmp, *nvghF, *nvhist, *nghist, *nhhist, *nvgh;
!   int E, i, sz[3], ups, doH, useFloat, scat;
    NrrdKernelSpec *k00, *k11, *k22;
    double amin[4], amax[4], spacing[4];
--- 528,532 ----
    char *me, *outS, *errS;
    Nrrd *nin, *npad, *nrsmp, *nvghF, *nvhist, *nghist, *nhhist, *nvgh;
!   int E, i, sz[3], ups, notdoH, useFloat, scat;
    NrrdKernelSpec *k00, *k11, *k22;
    double amin[4], amax[4], spacing[4];
***************
*** 549,555 ****
  	     "input volume, in nrrd format",
  	     NULL, NULL, nrrdHestNrrd);
!   hestOptAdd(&hopt, "h", NULL, airTypeInt, 0, 0, &doH, NULL,
! 	     "Make a 3-channel VGH volume, instead of the usual (default) "
! 	     "2-channel VG volume.");
    hestOptAdd(&hopt, "f", NULL, airTypeInt, 0, 0, &useFloat, NULL,
  	     "Keep the output volume in floating point, instead of "
--- 549,555 ----
  	     "input volume, in nrrd format",
  	     NULL, NULL, nrrdHestNrrd);
!   hestOptAdd(&hopt, "vg", NULL, airTypeInt, 0, 0, &notdoH, NULL,
! 	     "Make a 2-channel VG volume, instead of the usual (default) "
! 	     "3-channel VGH volume.");
    hestOptAdd(&hopt, "f", NULL, airTypeInt, 0, 0, &useFloat, NULL,
  	     "Keep the output volume in floating point, instead of "
***************
*** 586,590 ****
  	     "0.000",
  	     "Percent of voxels to through away in quantization (if doing "
! 	     "quantization) based their data value being too or too low. ");
    hestOptAdd(&hopt, "gp", "G perc", airTypeFloat, 1, 1, &gperc, "0.002",
  	     "Like \"-vp\", but for gradient magnitudes. ");
--- 586,591 ----
  	     "0.000",
  	     "Percent of voxels to through away in quantization (if doing "
! 	     "quantization) based their data value being too high or "
! 	     "too low. ");
    hestOptAdd(&hopt, "gp", "G perc", airTypeFloat, 1, 1, &gperc, "0.002",
  	     "Like \"-vp\", but for gradient magnitudes. ");
***************
*** 655,659 ****
    nvghF = nrrdNew();
    airMopAdd(mop, nvghF, (airMopper)nrrdNuke, airMopAlways);
!   if (qbertProbe(nvghF, nrsmp, k00, k11, k22, doH, sz)) {
      airMopAdd(mop, errS=biffGetDone(QBERT), airFree, airMopAlways);
      fprintf(stderr, "%s: trouble:\n%s\n", me, errS);
--- 656,660 ----
    nvghF = nrrdNew();
    airMopAdd(mop, nvghF, (airMopper)nrrdNuke, airMopAlways);
!   if (qbertProbe(nvghF, nrsmp, k00, k11, k22, !notdoH, sz)) {
      airMopAdd(mop, errS=biffGetDone(QBERT), airFree, airMopAlways);
      fprintf(stderr, "%s: trouble:\n%s\n", me, errS);
***************
*** 666,670 ****
      /* we're done! */
      if (scat && (qbertScat(nvghF, 1, scat, "vg.pgm")
! 		 || (doH && qbertScat(nvghF, 2, scat, "vh.pgm")))) {
        airMopAdd(mop, errS=biffGetDone(QBERT), airFree, airMopAlways);
        fprintf(stderr, "%s: trouble:\n%s\n", me, errS);
--- 667,671 ----
      /* we're done! */
      if (scat && (qbertScat(nvghF, 1, scat, "vg.pgm")
! 		 || (!notdoH && qbertScat(nvghF, 2, scat, "vh.pgm")))) {
        airMopAdd(mop, errS=biffGetDone(QBERT), airFree, airMopAlways);
        fprintf(stderr, "%s: trouble:\n%s\n", me, errS);
***************
*** 698,702 ****
      
      if (scat && (qbertScat(nvgh, 1, scat, "vg.pgm")
! 		 || (doH && qbertScat(nvgh, 2, scat, "vh.pgm")))) {
        airMopAdd(mop, errS=biffGetDone(QBERT), airFree, airMopAlways);
        fprintf(stderr, "%s: trouble:\n%s\n", me, errS);
--- 699,703 ----
      
      if (scat && (qbertScat(nvgh, 1, scat, "vg.pgm")
! 		 || (!notdoH && qbertScat(nvgh, 2, scat, "vh.pgm")))) {
        airMopAdd(mop, errS=biffGetDone(QBERT), airFree, airMopAlways);
        fprintf(stderr, "%s: trouble:\n%s\n", me, errS);
***************
*** 705,709 ****
  
      /* do final decoration of axes */
!     nrrdAxisInfoSet(nvgh, nrrdAxisInfoLabel, "vgh", "x", "y", "z");
      nrrdAxisInfoSet_nva(nvgh, nrrdAxisInfoMin, amin);
      nrrdAxisInfoSet_nva(nvgh, nrrdAxisInfoMax, amax);
--- 706,712 ----
  
      /* do final decoration of axes */
!     nrrdAxisInfoSet(nvgh, nrrdAxisInfoLabel,
! 		    !notdoH ? "vgh" : "vg",
! 		    "x", "y", "z");
      nrrdAxisInfoSet_nva(nvgh, nrrdAxisInfoMin, amin);
      nrrdAxisInfoSet_nva(nvgh, nrrdAxisInfoMax, amax);