|
From: <kin...@us...> - 2004-02-13 23:07:22
|
Update of /cvsroot/teem/teem/src/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30258 Modified Files: miter.c mrender.c pprobe.c qbert.c ungantry.c vprobe.c Log Message: changes in various libraries Index: miter.c =================================================================== RCS file: /cvsroot/teem/teem/src/bin/miter.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** miter.c 7 Jan 2004 15:34:28 -0000 1.21 --- miter.c 13 Feb 2004 23:01:12 -0000 1.22 *************** *** 48,53 **** hparm->respFileEnable = AIR_TRUE; ! hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &(muu->nin), NULL, ! "input nrrd to render", NULL, NULL, nrrdHestNrrd); hestOptAdd(&hopt, "txf", "nin", airTypeOther, 1, -1, &(muu->ntxf), NULL, "one or more transfer functions", --- 48,53 ---- hparm->respFileEnable = AIR_TRUE; ! hestOptAdd(&hopt, "i", "nsin", airTypeOther, 1, 1, &(muu->nsin), NULL, ! "input scalar volume to render", NULL, NULL, nrrdHestNrrd); hestOptAdd(&hopt, "txf", "nin", airTypeOther, 1, -1, &(muu->ntxf), NULL, "one or more transfer functions", *************** *** 137,142 **** } ! nrrdAxisInfoGet_nva(muu->nin, nrrdAxisInfoSize, muu->hctx->volSize); ! nrrdAxisInfoGet_nva(muu->nin, nrrdAxisInfoSpacing, muu->hctx->volSpacing); muu->hctx->user = muu; muu->hctx->renderBegin = (hooverRenderBegin_t *)miteRenderBegin; --- 137,142 ---- } ! nrrdAxisInfoGet_nva(muu->nsin, nrrdAxisInfoSize, muu->hctx->volSize); ! nrrdAxisInfoGet_nva(muu->nsin, nrrdAxisInfoSpacing, muu->hctx->volSpacing); muu->hctx->user = muu; muu->hctx->renderBegin = (hooverRenderBegin_t *)miteRenderBegin; Index: mrender.c =================================================================== RCS file: /cvsroot/teem/teem/src/bin/mrender.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mrender.c 7 Jan 2004 15:34:28 -0000 1.28 --- mrender.c 13 Feb 2004 23:01:12 -0000 1.29 *************** *** 111,115 **** biffAdd(MREND, err); return 1; } ! if (1 != gageKindScl->ansLength[uu->whatq]) { sprintf(err, "%s: quantity %s isn't a scalar; can't render it\n", me, airEnumStr(gageKindScl->enm, uu->whatq)); --- 111,115 ---- biffAdd(MREND, err); return 1; } ! if (1 != gageKindScl->table[uu->whatq].answerLength) { sprintf(err, "%s: quantity %s isn't a scalar; can't render it\n", me, airEnumStr(gageKindScl->enm, uu->whatq)); *************** *** 173,177 **** uu->ksp[gageKernel22]->kernel, uu->ksp[gageKernel22]->parm); ! if (!E) E |= gageQuerySet(uu->gctx0, pvl, 1 << uu->whatq); if (!E) E |= gageUpdate(uu->gctx0); if (E) { --- 173,177 ---- uu->ksp[gageKernel22]->kernel, uu->ksp[gageKernel22]->parm); ! if (!E) E |= gageQueryItemOn(uu->gctx0, pvl, uu->whatq); if (!E) E |= gageUpdate(uu->gctx0); if (E) { *************** *** 365,369 **** len = 0; for (i=airEnumUnknown(gageScl)+1; !airEnumValCheck(gageScl, i); i++) { ! if (1 == gageKindScl->ansLength[i]) { line = airEnumFmtDesc(gageScl, i, AIR_FALSE, "\n \b\bo \"%s\": %s"); len += strlen(line); --- 365,369 ---- len = 0; for (i=airEnumUnknown(gageScl)+1; !airEnumValCheck(gageScl, i); i++) { ! if (1 == gageKindScl->table[i].answerLength) { line = airEnumFmtDesc(gageScl, i, AIR_FALSE, "\n \b\bo \"%s\": %s"); len += strlen(line); *************** *** 376,380 **** /* 2nd pass through: create output */ for (i=airEnumUnknown(gageScl)+1; !airEnumValCheck(gageScl, i); i++) { ! if (1 == gageKindScl->ansLength[i]) { line = airEnumFmtDesc(gageScl, i, AIR_FALSE, "\n \b\bo \"%s\": %s"); strcat(ret, line); --- 376,380 ---- /* 2nd pass through: create output */ for (i=airEnumUnknown(gageScl)+1; !airEnumValCheck(gageScl, i); i++) { ! if (1 == gageKindScl->table[i].answerLength) { line = airEnumFmtDesc(gageScl, i, AIR_FALSE, "\n \b\bo \"%s\": %s"); strcat(ret, line); Index: pprobe.c =================================================================== RCS file: /cvsroot/teem/teem/src/bin/pprobe.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pprobe.c 7 Jan 2004 15:34:28 -0000 1.10 --- pprobe.c 13 Feb 2004 23:01:12 -0000 1.11 *************** *** 146,151 **** } ! ansLen = kind->ansLength[what]; ! iBaseDim = gageKindScl == kind ? 0 : 1; nin->axis[0+iBaseDim].spacing = SPACING(nin->axis[0+iBaseDim].spacing); nin->axis[1+iBaseDim].spacing = SPACING(nin->axis[1+iBaseDim].spacing); --- 146,151 ---- } ! ansLen = kind->table[what].answerLength; ! iBaseDim = kind->baseDim; nin->axis[0+iBaseDim].spacing = SPACING(nin->axis[0+iBaseDim].spacing); nin->axis[1+iBaseDim].spacing = SPACING(nin->axis[1+iBaseDim].spacing); *************** *** 164,168 **** if (!E) E |= gageKernelSet(ctx, gageKernel11, k11->kernel, k11->parm); if (!E) E |= gageKernelSet(ctx, gageKernel22, k22->kernel, k22->parm); ! if (!E) E |= gageQuerySet(ctx, pvl, 1 << what); if (!E) E |= gageUpdate(ctx); if (E) { --- 164,168 ---- if (!E) E |= gageKernelSet(ctx, gageKernel11, k11->kernel, k11->parm); if (!E) E |= gageKernelSet(ctx, gageKernel22, k22->kernel, k22->parm); ! if (!E) E |= gageQueryItemOn(ctx, pvl, what); if (!E) E |= gageUpdate(ctx); if (E) { Index: qbert.c =================================================================== RCS file: /cvsroot/teem/teem/src/bin/qbert.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** qbert.c 9 Feb 2004 07:21:14 -0000 1.19 --- qbert.c 13 Feb 2004 23:01:12 -0000 1.20 *************** *** 192,196 **** gage_t *val, *gmag, *scnd; float *vghF; ! int E, i, j, k, query; airArray *mop; --- 192,196 ---- gage_t *val, *gmag, *scnd; float *vghF; ! int E, i, j, k; airArray *mop; *************** *** 219,227 **** if (!E) E |= gageKernelSet(ctx, gageKernel11, k11->kernel, k11->parm); if (!E) E |= gageKernelSet(ctx, gageKernel22, k22->kernel, k22->parm); ! query = (1 << gageSclValue) | (1 << gageSclGradMag); if (doH) { ! query |= (1 << gageScl2ndDD); } - if (!E) E |= gageQuerySet(ctx, pvl, query); if (!E) E |= gageUpdate(ctx); if (E) { --- 219,227 ---- if (!E) E |= gageKernelSet(ctx, gageKernel11, k11->kernel, k11->parm); if (!E) E |= gageKernelSet(ctx, gageKernel22, k22->kernel, k22->parm); ! if (!E) E |= gageQueryItemOn(ctx, pvl, gageSclValue); ! if (!E) E |= gageQueryItemOn(ctx, pvl, gageSclGradMag); if (doH) { ! if (!E) E |= gageQueryItemOn(ctx, pvl, gageScl2ndDD); } if (!E) E |= gageUpdate(ctx); if (E) { Index: ungantry.c =================================================================== RCS file: /cvsroot/teem/teem/src/bin/ungantry.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ungantry.c 7 Jan 2004 15:34:28 -0000 1.8 --- ungantry.c 13 Feb 2004 23:01:12 -0000 1.9 *************** *** 105,109 **** if (!E) E |= gageKernelSet(ctx, gageKernel00, gantric->kernel, gantric->parm); ! if (!E) E |= gageQuerySet(ctx, pvl, 1 << gageSclValue); if (!E) E |= gageUpdate(ctx); if (E) { --- 105,109 ---- if (!E) E |= gageKernelSet(ctx, gageKernel00, gantric->kernel, gantric->parm); ! if (!E) E |= gageQueryItemOn(ctx, pvl, gageSclValue); if (!E) E |= gageUpdate(ctx); if (E) { Index: vprobe.c =================================================================== RCS file: /cvsroot/teem/teem/src/bin/vprobe.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** vprobe.c 7 Jan 2004 15:34:28 -0000 1.19 --- vprobe.c 13 Feb 2004 23:01:12 -0000 1.20 *************** *** 143,148 **** } ! ansLen = kind->ansLength[what]; ! iBaseDim = gageKindScl == kind ? 0 : 1; oBaseDim = 1 == ansLen ? 0 : 1; six = nin->axis[0+iBaseDim].size; --- 143,148 ---- } ! ansLen = kind->table[what].answerLength; ! iBaseDim = kind->baseDim; oBaseDim = 1 == ansLen ? 0 : 1; six = nin->axis[0+iBaseDim].size; *************** *** 173,177 **** if (!E) E |= gageKernelSet(ctx, gageKernel11, k11->kernel, k11->parm); if (!E) E |= gageKernelSet(ctx, gageKernel22, k22->kernel, k22->parm); ! if (!E) E |= gageQuerySet(ctx, pvl, 1 << what); if (!E) E |= gageUpdate(ctx); if (E) { --- 173,177 ---- if (!E) E |= gageKernelSet(ctx, gageKernel11, k11->kernel, k11->parm); if (!E) E |= gageKernelSet(ctx, gageKernel22, k22->kernel, k22->parm); ! if (!E) E |= gageQueryItemOn(ctx, pvl, what); if (!E) E |= gageUpdate(ctx); if (E) { |