Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7227] teem/trunk/src/unrrdu
|
From: <kin...@us...> - 2024-07-23 16:57:54
|
Revision: 7227
http://sourceforge.net/p/teem/code/7227
Author: kindlmann
Date: 2024-07-23 16:57:52 +0000 (Tue, 23 Jul 2024)
Log Message:
-----------
more complete use of nrrdHestNrrdNoTTY instead of nrrdHestNrrd
Modified Paths:
--------------
teem/trunk/src/unrrdu/aabplot.c
teem/trunk/src/unrrdu/ccmerge.c
teem/trunk/src/unrrdu/crop.c
teem/trunk/src/unrrdu/dering.c
teem/trunk/src/unrrdu/diff.c
teem/trunk/src/unrrdu/histo.c
teem/trunk/src/unrrdu/ilk.c
teem/trunk/src/unrrdu/imap.c
teem/trunk/src/unrrdu/inset.c
teem/trunk/src/unrrdu/jhisto.c
teem/trunk/src/unrrdu/join.c
teem/trunk/src/unrrdu/lut.c
teem/trunk/src/unrrdu/lut2.c
teem/trunk/src/unrrdu/mlut.c
teem/trunk/src/unrrdu/mrmap.c
teem/trunk/src/unrrdu/ninspect.c
teem/trunk/src/unrrdu/privateUnrrdu.h
teem/trunk/src/unrrdu/rmap.c
teem/trunk/src/unrrdu/splice.c
teem/trunk/src/unrrdu/sselect.c
teem/trunk/src/unrrdu/vidicon.c
Modified: teem/trunk/src/unrrdu/aabplot.c
===================================================================
--- teem/trunk/src/unrrdu/aabplot.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/aabplot.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -51,7 +51,7 @@
"if given a 1D nrrd here that matches the number of "
"rows in the \"-i\" input, interpret it as a list of values "
"that should be indicated with \"X\"s in the plots.",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
mop = airMopNew();
airMopAdd(mop, opt, hestOptFree_vp, airMopAlways);
Modified: teem/trunk/src/unrrdu/ccmerge.c
===================================================================
--- teem/trunk/src/unrrdu/ccmerge.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/ccmerge.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -69,7 +69,7 @@
"for value-directed merging (with non-zero \"-d\" option), "
"or if the \"-revalue\" option is given, "
"but is not needed otherwise",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
OPT_ADD_NOUT(out, "output nrrd");
mop = airMopNew();
Modified: teem/trunk/src/unrrdu/crop.c
===================================================================
--- teem/trunk/src/unrrdu/crop.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/crop.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -61,7 +61,7 @@
"-min, second is for -max. Unfortunately the "
"\"m\" and \"M\" semantics (above) are currently not "
"supported in the bounds file.",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
OPT_ADD_NIN(nin, "input nrrd");
OPT_ADD_NOUT(out, "output nrrd");
Modified: teem/trunk/src/unrrdu/dering.c
===================================================================
--- teem/trunk/src/unrrdu/dering.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/dering.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -72,7 +72,7 @@
"output where mask=1. This lerp is effectively the same "
"as a \"unu 3op lerp\", so this should either be match the "
"input in size, or match its slices along the slowest axis.",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
hestOptAdd_1_Double(&opt, "b,back", "val", &backval, "0.0",
"when using a mask (\"-m\"), the background value to "
"lerp with.");
Modified: teem/trunk/src/unrrdu/diff.c
===================================================================
--- teem/trunk/src/unrrdu/diff.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/diff.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -42,9 +42,10 @@
char explain[AIR_STRLEN_LARGE + 1];
mop = airMopNew();
- hestOptAdd_1_Other(&opt, NULL, "ninA", &ninA, NULL, "First input nrrd.", nrrdHestNrrd);
+ hestOptAdd_1_Other(&opt, NULL, "ninA", &ninA, NULL, "First input nrrd.",
+ nrrdHestNrrdNoTTY);
hestOptAdd_1_Other(&opt, NULL, "ninB", &ninB, NULL, "Second input nrrd.",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
hestOptAdd_1_Double(&opt, "eps,epsilon", "eps", &epsilon, "0.0",
"threshold for allowable difference in values in "
"data values");
Modified: teem/trunk/src/unrrdu/histo.c
===================================================================
--- teem/trunk/src/unrrdu/histo.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/histo.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -45,7 +45,7 @@
"(not using this option), the increment is one bin count per "
"sample, but by giving a nrrd, the value in the nrrd at the "
"corresponding location will be the bin count increment ",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
hestOptAdd_1_String(&opt, "min,minimum", "value", &minStr, "nan",
"Value at low end of histogram, given explicitly as a "
"regular number, "
Modified: teem/trunk/src/unrrdu/ilk.c
===================================================================
--- teem/trunk/src/unrrdu/ilk.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/ilk.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -284,7 +284,7 @@
"transform is set up to regularly sample the rectangle that, due to "
"perspective distortion, has corners with the X,Y coordinates given in "
"this filename, in scan-line order.",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
hestOptAdd_1_Enum(&opt, "b", "boundary", &bound, "bleed",
"what to do when sampling outside original image.\n "
"\b\bo \"bleed\": copy values at image border outward\n "
@@ -307,7 +307,7 @@
hestOptAdd_2_Int(&opt, "db", "x y", debug, "-1 -1",
"if both non-negative, turn on verbose debugging for this output "
"image pixel");
- hestOptAdd_1_Other(&opt, "i", "image", &nin, "-", "input 2D image", nrrdHestNrrd);
+ hestOptAdd_1_Other(&opt, "i", "image", &nin, "-", "input 2D image", nrrdHestNrrdNoTTY);
OPT_ADD_NOUT(outS, "output image");
mop = airMopNew();
Modified: teem/trunk/src/unrrdu/imap.c
===================================================================
--- teem/trunk/src/unrrdu/imap.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/imap.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -46,7 +46,7 @@
double min, max;
hestOptAdd_1_Other(&opt, "m,map", "map", &nmap, NULL,
- "irregular map to map input nrrd through", nrrdHestNrrd);
+ "irregular map to map input nrrd through", nrrdHestNrrdNoTTY);
hestOptAdd_1_UInt(&opt, "l,length", "aclLen", &aclLen, "0",
"length of accelerator array, used to try to speed-up "
"task of finding between which pair of control points "
Modified: teem/trunk/src/unrrdu/inset.c
===================================================================
--- teem/trunk/src/unrrdu/inset.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/inset.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -47,7 +47,7 @@
minLen);
hestOptAdd_1_Other(&opt, "s,subset", "nsub", &(nsub), NULL,
"sub-region nrrd. This the data to be inset in \"nin\"",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
OPT_ADD_NIN(nin, "input nrrd");
OPT_ADD_NOUT(out, "output nrrd");
Modified: teem/trunk/src/unrrdu/jhisto.c
===================================================================
--- teem/trunk/src/unrrdu/jhisto.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/jhisto.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -53,7 +53,7 @@
"(not using this option), the increment is one bin count per "
"sample, but by giving a nrrd, the value in the nrrd at the "
"corresponding location will be the bin count increment ",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
hestOptAdd_Nv_Double(&opt, "min,minimum", "min0 min1", 2, -1, &min, "nan nan",
"min<i> is the low range of values to be quantized along "
"axis i; use \"nan\" to represent lowest value present ",
@@ -70,7 +70,7 @@
hestOptAdd_Nv_Other(&opt, "i,input", "nin0 [nin1]", 1, -1, &nin, "-",
"list of nrrds (one for each axis of joint histogram), "
"or, single nrrd that will be sliced along specified axis.",
- &ninLen, nrrdHestNrrd);
+ &ninLen, nrrdHestNrrdNoTTY);
hestOptAdd_1_UInt(&opt, "a,axis", "axis", &diceax, "0",
"axis to slice along when working with single nrrd. ");
OPT_ADD_NOUT(out, "output nrrd");
Modified: teem/trunk/src/unrrdu/join.c
===================================================================
--- teem/trunk/src/unrrdu/join.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/join.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -50,7 +50,7 @@
hparm->respFileEnable = AIR_TRUE;
hestOptAdd_Nv_Other(&opt, "i,input", "nin0", 1, -1, &nin, NULL,
- "everything to be joined together", &ninLen, nrrdHestNrrd);
+ "everything to be joined together", &ninLen, nrrdHestNrrdNoTTY);
OPT_ADD_AXIS(axis, "axis to join along");
hestOptAdd_Flag(&opt, "incr", &incrDim,
"in situations where the join axis is *not* among the existing "
Modified: teem/trunk/src/unrrdu/lut.c
===================================================================
--- teem/trunk/src/unrrdu/lut.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/lut.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -43,7 +43,7 @@
NrrdRange *range = NULL;
hestOptAdd_1_Other(&opt, "m,map", "lut", &nlut, NULL,
- "lookup table to map input nrrd through", nrrdHestNrrd);
+ "lookup table to map input nrrd through", nrrdHestNrrdNoTTY);
hestOptAdd_Flag(&opt, "r,rescale", &rescale,
"rescale the input values from the input range to the "
"lut domain. The lut domain is either explicitly "
Modified: teem/trunk/src/unrrdu/lut2.c
===================================================================
--- teem/trunk/src/unrrdu/lut2.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/lut2.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -44,7 +44,7 @@
unsigned int mapAxis, rai;
hestOptAdd_1_Other(&opt, "m,map", "lut", &nlut, NULL,
- "lookup table to map input nrrd through", nrrdHestNrrd);
+ "lookup table to map input nrrd through", nrrdHestNrrdNoTTY);
hestOptAdd_2_Bool(&opt, "r,rescale", "bool bool", rescale, "false false",
"rescale one or both of the input values from the "
"input range to the lut domain. The lut domain is either "
Modified: teem/trunk/src/unrrdu/mlut.c
===================================================================
--- teem/trunk/src/unrrdu/mlut.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/mlut.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -46,7 +46,7 @@
"one nrrd of lookup tables to map input nrrd through, or, "
"list of nrrds which contain the individual entries of "
"the lookup table at each voxel, which will be joined together.",
- &_nmlutLen, nrrdHestNrrd);
+ &_nmlutLen, nrrdHestNrrdNoTTY);
hestOptAdd_Flag(&opt, "r,rescale", &rescale,
"rescale the input values from the input range to the "
"lut domain. The lut domain is either explicitly "
Modified: teem/trunk/src/unrrdu/mrmap.c
===================================================================
--- teem/trunk/src/unrrdu/mrmap.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/mrmap.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -46,7 +46,7 @@
"one nrrd of regular maps to map input nrrd through, or, "
"list of nrrds which contain the individual entries of the map "
"at each voxel, which will be joined together.",
- &_nmmapLen, nrrdHestNrrd);
+ &_nmmapLen, nrrdHestNrrdNoTTY);
hestOptAdd_Flag(&opt, "r,rescale", &rescale,
"rescale the input values from the input range to the "
"map domain. The map domain is either explicitly "
Modified: teem/trunk/src/unrrdu/ninspect.c
===================================================================
--- teem/trunk/src/unrrdu/ninspect.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/ninspect.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -342,7 +342,8 @@
mop = airMopNew();
hestOptAdd_1_Other(&opt, "i", "nin", &nin, "-",
- "input nrrd to project. Must be three dimensional.", nrrdHestNrrd);
+ "input nrrd to project. Must be three dimensional.",
+ nrrdHestNrrdNoTTY);
hestOptAdd_1_Float(&opt, "amt", "heq", &heqamount, "0.5",
"how much to apply histogram equalization to projection images");
hestOptAdd_1_UInt(
Modified: teem/trunk/src/unrrdu/privateUnrrdu.h
===================================================================
--- teem/trunk/src/unrrdu/privateUnrrdu.h 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/privateUnrrdu.h 2024-07-23 16:57:52 UTC (rev 7227)
@@ -189,7 +189,7 @@
*/
/* Nrrd *var */
#define OPT_ADD_NIN(var, desc) \
- hestOptAdd_1_Other(&opt, "i,input", "nin", &(var), "-", desc, nrrdHestNrrd)
+ hestOptAdd_1_Other(&opt, "i,input", "nin", &(var), "-", desc, nrrdHestNrrdNoTTY)
/* char *var */
#define OPT_ADD_NOUT(var, desc) \
Modified: teem/trunk/src/unrrdu/rmap.c
===================================================================
--- teem/trunk/src/unrrdu/rmap.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/rmap.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -50,7 +50,7 @@
double min, max;
hestOptAdd_1_Other(&opt, "m,map", "map", &nmap, NULL,
- "regular map to map input nrrd through", nrrdHestNrrd);
+ "regular map to map input nrrd through", nrrdHestNrrdNoTTY);
hestOptAdd_Flag(&opt, "r,rescale", &rescale,
"rescale the input values from the input range to the "
"map domain. The map domain is either explicitly "
Modified: teem/trunk/src/unrrdu/splice.c
===================================================================
--- teem/trunk/src/unrrdu/splice.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/splice.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -47,7 +47,7 @@
&unrrduHestPosCB);
hestOptAdd_1_Other(&opt, "s,slice", "nslice", &(nslice), NULL,
"slice nrrd. This is the slice to insert into \"nin\"",
- nrrdHestNrrd);
+ nrrdHestNrrdNoTTY);
OPT_ADD_NIN(nin, "input nrrd. This is the nrrd into which the slice is "
"inserted");
OPT_ADD_NOUT(out, "output nrrd");
Modified: teem/trunk/src/unrrdu/sselect.c
===================================================================
--- teem/trunk/src/unrrdu/sselect.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/sselect.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -43,7 +43,8 @@
OPT_ADD_NIN(nin, "input nrrd");
OPT_ADD_AXIS(axis, "axis to slice along");
hestOptAdd_1_Other(&opt, "s,selector", "nline", &nline, NULL,
- "the 1-D nrrd of values to compare with threshold", nrrdHestNrrd);
+ "the 1-D nrrd of values to compare with threshold",
+ nrrdHestNrrdNoTTY);
hestOptAdd_1_Double(&opt, "th", "thresh", &thresh, NULL, "threshold on selector line");
hestOptAdd_2_String(&opt, "o,output", "above below", outS, "- x",
"outputs for slices corresponding to values "
Modified: teem/trunk/src/unrrdu/vidicon.c
===================================================================
--- teem/trunk/src/unrrdu/vidicon.c 2024-07-23 16:53:39 UTC (rev 7226)
+++ teem/trunk/src/unrrdu/vidicon.c 2024-07-23 16:57:52 UTC (rev 7227)
@@ -44,7 +44,7 @@
hparm->elideSingleOtherDefault = AIR_FALSE;
hestOptAdd_1_Other(&opt, "i", "input", &nin, NULL,
- "input image. Should be grayscale PNG.", nrrdHestNrrd);
+ "input image. Should be grayscale PNG.", nrrdHestNrrdNoTTY);
hestOptAdd_1_Double(&opt, "rs", "rescale", &rescale, "0.75",
"how to rescale (downsample) the image prior to processing, "
"just to get a better representation of the floating-point "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
