Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7106] teem/trunk/src/limn
|
From: <kin...@us...> - 2023-07-15 12:25:22
|
Revision: 7106
http://sourceforge.net/p/teem/code/7106
Author: kindlmann
Date: 2023-07-15 12:25:19 +0000 (Sat, 15 Jul 2023)
Log Message:
-----------
updating hest usage
Modified Paths:
--------------
teem/trunk/src/limn/lpu_cbfit.c
teem/trunk/src/limn/lpu_ccfind.c
teem/trunk/src/limn/lpu_meas.c
teem/trunk/src/limn/lpu_psel.c
teem/trunk/src/limn/lpu_rast.c
teem/trunk/src/limn/lpu_sort.c
teem/trunk/src/limn/lpu_verts.c
Modified: teem/trunk/src/limn/lpu_cbfit.c
===================================================================
--- teem/trunk/src/limn/lpu_cbfit.c 2023-07-15 12:13:27 UTC (rev 7105)
+++ teem/trunk/src/limn/lpu_cbfit.c 2023-07-15 12:25:19 UTC (rev 7106)
@@ -42,44 +42,39 @@
limnCBFContext fctx;
limnCBFPath *path;
- hestOptAdd(&hopt, "i", "input", airTypeOther, 1, 1, &_nin, NULL, "input xy points",
- NULL, NULL, nrrdHestNrrd);
- hestOptAdd(&hopt, "v", "verbose", airTypeInt, 1, 1, &verbose, "1", "verbosity level");
- hestOptAdd(&hopt, "s", "synth", airTypeInt, 0, 0, &synth, NULL,
- "synthesize xy points from control points");
- hestOptAdd(&hopt, "so", "synth out", airTypeString, 1, 1, &synthOut, "",
- "if non-empty, filename in which to save synthesized xy pts");
- hestOptAdd(&hopt, "snf", NULL, airTypeInt, 0, 0, &nofit, NULL,
- "actually do not fit, just save -so synthetic "
- "output and quit");
- hestOptAdd(&hopt, "t1", "tan", airTypeDouble, 2, 2, utt1, "nan nan",
- "if non-nan, the outgoing tangent from the first point");
- hestOptAdd(&hopt, "t2", "tan", airTypeDouble, 2, 2, utt2, "nan nan",
- "if non-nan, the incoming tangent to the last point");
- hestOptAdd(&hopt, "im", "max", airTypeUInt, 1, 1, &iterMax, "0",
- "(if non-zero) max # nrp iterations to run");
- hestOptAdd(&hopt, "deltam", "delta", airTypeDouble, 1, 1, &deltaMin, "0.0005",
- "(if non-zero) stop nrp when change in spline "
- "domain sampling goes below this");
- hestOptAdd(&hopt, "distm", "dist", airTypeDouble, 1, 1, &distMin, "0.01",
- "(if non-zero) stop nrp when distance between spline "
- "and points goes below this");
- hestOptAdd(&hopt, "dists", "scl", airTypeDouble, 1, 1, &distScl, "0.25",
- "scaling on nrp distMin check");
- hestOptAdd(&hopt, "psi", "psi", airTypeDouble, 1, 1, &psi, "10", "psi, of course");
- hestOptAdd(&hopt, "ca", "angle", airTypeDouble, 1, 1, &cangle, "100",
- "angle indicating a corner");
- hestOptAdd(&hopt, "scl", "scale", airTypeDouble, 1, 1, &scale, "0",
- "scale for geometry estimation");
- hestOptAdd(&hopt, "loop", NULL, airTypeInt, 0, 0, &loop, NULL,
- "given xy points are actually a loop; BUT "
- "the first and last points need to be the same!");
- hestOptAdd(&hopt, "petc", NULL, airTypeInt, 0, 0, &petc, NULL,
- "(Press Enter To Continue) ");
+ hestOptAdd_1_Other(&hopt, "i", "input", &_nin, NULL, "input xy points", nrrdHestNrrd);
+ hestOptAdd_1_Int(&hopt, "v", "verbose", &verbose, "1", "verbosity level");
+ hestOptAdd_Flag(&hopt, "s", &synth, "synthesize xy points from control points");
+ hestOptAdd_1_String(&hopt, "so", "synth out", &synthOut, "",
+ "if non-empty, filename in which to save synthesized xy pts");
+ hestOptAdd_Flag(&hopt, "snf", &nofit,
+ "actually do not fit, just save -so synthetic "
+ "output and quit");
+ hestOptAdd_2_Double(&hopt, "t1", "tan", utt1, "nan nan",
+ "if non-nan, the outgoing tangent from the first point");
+ hestOptAdd_2_Double(&hopt, "t2", "tan", utt2, "nan nan",
+ "if non-nan, the incoming tangent to the last point");
+ hestOptAdd_1_UInt(&hopt, "im", "max", &iterMax, "0",
+ "(if non-zero) max # nrp iterations to run");
+ hestOptAdd_1_Double(&hopt, "deltam", "delta", &deltaMin, "0.0005",
+ "(if non-zero) stop nrp when change in spline "
+ "domain sampling goes below this");
+ hestOptAdd_1_Double(&hopt, "distm", "dist", &distMin, "0.01",
+ "(if non-zero) stop nrp when distance between spline "
+ "and points goes below this");
+ hestOptAdd_1_Double(&hopt, "dists", "scl", &distScl, "0.25",
+ "scaling on nrp distMin check");
+ hestOptAdd_1_Double(&hopt, "psi", "psi", &psi, "10", "psi, of course");
+ hestOptAdd_1_Double(&hopt, "ca", "angle", &cangle, "100", "angle indicating a corner");
+ hestOptAdd_1_Double(&hopt, "scl", "scale", &scale, "0",
+ "scale for geometry estimation");
+ hestOptAdd_Flag(&hopt, "loop", &loop,
+ "given xy points are actually a loop; BUT "
+ "the first and last points need to be the same!");
+ hestOptAdd_Flag(&hopt, "petc", &petc, "(Press Enter To Continue) ");
/*
- hestOptAdd(&hopt, NULL, "output", airTypeString, 1, 1, &out, NULL,
- "output nrrd filename");
- */
+ hestOptAdd_1_String(&hopt, NULL, "output", &out, NULL, "output nrrd filename");
+ */
mop = airMopNew();
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
Modified: teem/trunk/src/limn/lpu_ccfind.c
===================================================================
--- teem/trunk/src/limn/lpu_ccfind.c 2023-07-15 12:13:27 UTC (rev 7105)
+++ teem/trunk/src/limn/lpu_ccfind.c 2023-07-15 12:25:19 UTC (rev 7106)
@@ -36,10 +36,9 @@
Nrrd *nmeas;
char *out;
- hestOptAdd(&hopt, NULL, "input", airTypeOther, 1, 1, &pld, NULL,
- "input polydata filename", NULL, NULL, limnHestPolyDataLMPD);
- hestOptAdd(&hopt, NULL, "output", airTypeString, 1, 1, &out, NULL,
- "output polydata filename");
+ hestOptAdd_1_Other(&hopt, NULL, "input", &pld, NULL, "input polydata filename",
+ limnHestPolyDataLMPD);
+ hestOptAdd_1_String(&hopt, NULL, "output", &out, NULL, "output polydata filename");
mop = airMopNew();
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
Modified: teem/trunk/src/limn/lpu_meas.c
===================================================================
--- teem/trunk/src/limn/lpu_meas.c 2023-07-15 12:13:27 UTC (rev 7105)
+++ teem/trunk/src/limn/lpu_meas.c 2023-07-15 12:25:19 UTC (rev 7106)
@@ -37,10 +37,9 @@
Nrrd *nout;
char *out;
- hestOptAdd(&hopt, NULL, "input", airTypeOther, 1, 1, &pld, NULL,
- "input polydata filename", NULL, NULL, limnHestPolyDataLMPD);
- hestOptAdd(&hopt, NULL, "output", airTypeString, 1, 1, &out, NULL,
- "output nrrd filename");
+ hestOptAdd_1_Other(&hopt, NULL, "input", &pld, NULL, "input polydata filename",
+ limnHestPolyDataLMPD);
+ hestOptAdd_1_String(&hopt, NULL, "output", &out, NULL, "output nrrd filename");
mop = airMopNew();
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
Modified: teem/trunk/src/limn/lpu_psel.c
===================================================================
--- teem/trunk/src/limn/lpu_psel.c 2023-07-15 12:13:27 UTC (rev 7105)
+++ teem/trunk/src/limn/lpu_psel.c 2023-07-15 12:25:19 UTC (rev 7106)
@@ -40,12 +40,11 @@
char *out;
size_t size[NRRD_DIM_MAX];
- hestOptAdd(&hopt, "r", "range", airTypeUInt, 2, 2, prange, NULL,
- "range of indices of primitives to select");
- hestOptAdd(&hopt, NULL, "input", airTypeOther, 1, 1, &pldIn, NULL,
- "input polydata filename", NULL, NULL, limnHestPolyDataLMPD);
- hestOptAdd(&hopt, NULL, "output", airTypeString, 1, 1, &out, NULL,
- "output polydata filename");
+ hestOptAdd_2_UInt(&hopt, "r", "range", prange, NULL,
+ "range of indices of primitives to select");
+ hestOptAdd_1_Other(&hopt, NULL, "input", &pldIn, NULL, "input polydata filename",
+ limnHestPolyDataLMPD);
+ hestOptAdd_1_String(&hopt, NULL, "output", &out, NULL, "output polydata filename");
mop = airMopNew();
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
Modified: teem/trunk/src/limn/lpu_rast.c
===================================================================
--- teem/trunk/src/limn/lpu_rast.c 2023-07-15 12:13:27 UTC (rev 7105)
+++ teem/trunk/src/limn/lpu_rast.c 2023-07-15 12:25:19 UTC (rev 7106)
@@ -39,16 +39,14 @@
int type;
size_t size[NRRD_DIM_MAX];
- hestOptAdd(&hopt, "min", "min", airTypeDouble, 3, 3, min, NULL, "bottom corner");
- hestOptAdd(&hopt, "max", "max", airTypeDouble, 3, 3, max, NULL, "top corner");
- hestOptAdd(&hopt, "s", "size", airTypeSize_t, 3, 3, size, NULL,
- "number of samples along each axis");
- hestOptAdd(&hopt, "t", "type", airTypeEnum, 1, 1, &type, "uchar",
- "type of output nrrd", NULL, nrrdType);
- hestOptAdd(&hopt, NULL, "input", airTypeOther, 1, 1, &pld, NULL,
- "input polydata filename", NULL, NULL, limnHestPolyDataLMPD);
- hestOptAdd(&hopt, NULL, "output", airTypeString, 1, 1, &out, NULL,
- "output nrrd filename");
+ hestOptAdd_3_Double(&hopt, "min", "min", min, NULL, "bottom corner");
+ hestOptAdd_3_Double(&hopt, "max", "max", max, NULL, "top corner");
+ hestOptAdd_3_Size_t(&hopt, "s", "size", size, NULL,
+ "number of samples along each axis");
+ hestOptAdd_1_Enum(&hopt, "t", "type", &type, "uchar", "type of output nrrd", nrrdType);
+ hestOptAdd_1_Other(&hopt, NULL, "input", &pld, NULL, "input polydata filename",
+ limnHestPolyDataLMPD);
+ hestOptAdd_1_String(&hopt, NULL, "output", &out, NULL, "output nrrd filename");
mop = airMopNew();
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
Modified: teem/trunk/src/limn/lpu_sort.c
===================================================================
--- teem/trunk/src/limn/lpu_sort.c 2023-07-15 12:13:27 UTC (rev 7105)
+++ teem/trunk/src/limn/lpu_sort.c 2023-07-15 12:25:19 UTC (rev 7106)
@@ -36,12 +36,11 @@
Nrrd *nin;
char *out;
- hestOptAdd(&hopt, NULL, "input lpld", airTypeOther, 1, 1, &pld, NULL,
- "input polydata filename", NULL, NULL, limnHestPolyDataLMPD);
- hestOptAdd(&hopt, NULL, "input nrrd", airTypeOther, 1, 1, &nin, NULL,
- "input nrrd filename", NULL, NULL, nrrdHestNrrd);
- hestOptAdd(&hopt, NULL, "output", airTypeString, 1, 1, &out, NULL,
- "output lpld filename");
+ hestOptAdd_1_Other(&hopt, NULL, "input lpld", &pld, NULL, "input polydata filename",
+ limnHestPolyDataLMPD);
+ hestOptAdd_1_Other(&hopt, NULL, "input nrrd", &nin, NULL, "input nrrd filename",
+ nrrdHestNrrd);
+ hestOptAdd_1_String(&hopt, NULL, "output", &out, NULL, "output lpld filename");
mop = airMopNew();
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
Modified: teem/trunk/src/limn/lpu_verts.c
===================================================================
--- teem/trunk/src/limn/lpu_verts.c 2023-07-15 12:13:27 UTC (rev 7105)
+++ teem/trunk/src/limn/lpu_verts.c 2023-07-15 12:25:19 UTC (rev 7106)
@@ -36,10 +36,9 @@
Nrrd *nout;
char *out;
- hestOptAdd(&hopt, NULL, "input", airTypeOther, 1, 1, &pld, NULL,
- "input polydata filename", NULL, NULL, limnHestPolyDataLMPD);
- hestOptAdd(&hopt, NULL, "output", airTypeString, 1, 1, &out, NULL,
- "output nrrd filename");
+ hestOptAdd_1_Other(&hopt, NULL, "input", &pld, NULL, "input polydata filename",
+ limnHestPolyDataLMPD);
+ hestOptAdd_1_String(&hopt, NULL, "output", &out, NULL, "output nrrd filename");
mop = airMopNew();
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
