Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7233] teem/trunk/src/limn
|
From: <kin...@us...> - 2024-07-25 00:34:46
|
Revision: 7233
http://sourceforge.net/p/teem/code/7233
Author: kindlmann
Date: 2024-07-25 00:34:44 +0000 (Thu, 25 Jul 2024)
Log Message:
-----------
limnCbfTVT now computes scale=0 TVT, and that is now passed back to fctx->cornerCB corner tester
Modified Paths:
--------------
teem/trunk/src/limn/limn.h
teem/trunk/src/limn/lpu_cbfit.c
teem/trunk/src/limn/splineFit.c
Modified: teem/trunk/src/limn/limn.h
===================================================================
--- teem/trunk/src/limn/limn.h 2024-07-24 23:36:11 UTC (rev 7232)
+++ teem/trunk/src/limn/limn.h 2024-07-25 00:34:44 UTC (rev 7233)
@@ -560,11 +560,11 @@
continuous between multiple spline segments) */
cornerNMS; /* (if cornerFind) non-minimal-suppression of corners: accept as
corners only those with locally minimal angle */
- int (*cornerCB)(double *tvtNew, /* if corner, set new TVT */
+ int (*cornerCB)(double *tvtNew, /* if corner (non-zero return), set new TVT */
const struct limnCbfCtx_t *fctx, /* this struct */
- double angleMeas, /* measured angle */
- const double *tvtMeas, /* measured TVT */
- const double *vertOrig); /* original vertex pos */
+ double angleMeas, /* angle measured at fctx->scale */
+ const double *tvtMeas, /* TVT measured at fctx->scale */
+ const double *tvt0); /* TVT at scale=0 */
const void *cornerCBData; /* holds extra info for cornerCB */
unsigned int nrpIterMax; /* max # iters of nrp */
double
@@ -937,7 +937,7 @@
LIMN_EXPORT void limnCbfSegEval(double *xy, const limnCbfSeg *seg, double tt);
LIMN_EXPORT void limnCbfPathSample(double *xy, unsigned int pointNum,
const limnCbfPath *path);
-LIMN_EXPORT int limnCbfTVT(double lt[2], double vv[2], double rt[2],
+LIMN_EXPORT int limnCbfTVT(double lt[2], double vv[2], double rt[2], double *tvt0,
const limnCbfCtx *fctx, const limnCbfPoints *lpnt,
unsigned int loi, unsigned int hii, unsigned int vvi,
int oneSided);
Modified: teem/trunk/src/limn/lpu_cbfit.c
===================================================================
--- teem/trunk/src/limn/lpu_cbfit.c 2024-07-24 23:36:11 UTC (rev 7232)
+++ teem/trunk/src/limn/lpu_cbfit.c 2024-07-25 00:34:44 UTC (rev 7233)
@@ -352,7 +352,7 @@
tvt[2], tvt[0], tvt[1], vvi, loi, hii);
if (!E) E |= limnCbfCtxPrep(fctx, lpnt);
if (!E && fctx->verbose) printf("%s: limnCbfCtxPrep done, calling limnCbfTVT\n", me);
- if (!E) E |= limnCbfTVT(lt, vv, rt, fctx, lpnt, loi, hii, vvi, oneSided);
+ if (!E) E |= limnCbfTVT(lt, vv, rt, NULL, fctx, lpnt, loi, hii, vvi, oneSided);
if (E) {
airMopAdd(mop, err = biffGetDone(LIMN), airFree, airMopAlways);
fprintf(stderr, "%s: trouble doing lone tangent-vertex-tangent:\n%s", me, err);
Modified: teem/trunk/src/limn/splineFit.c
===================================================================
--- teem/trunk/src/limn/splineFit.c 2024-07-24 23:36:11 UTC (rev 7232)
+++ teem/trunk/src/limn/splineFit.c 2024-07-25 00:34:44 UTC (rev 7233)
@@ -785,8 +785,9 @@
That (via ctxBuffersSet) allocates things that we depend on here.
*/
int /* Biff: 1 */
-limnCbfTVT(double lt[2], double vv[2], double rt[2], const limnCbfCtx *fctx,
- const limnCbfPoints *lpnt, uint gloi, uint ghii, uint gvvi, int oneSided) {
+limnCbfTVT(double lt[2], double vv[2], double rt[2], double *tvt0,
+ const limnCbfCtx *fctx, const limnCbfPoints *lpnt, uint gloi, uint ghii,
+ uint gvvi, int oneSided) {
static const char me[] = "limnCbfTVT";
uint loi, /* error-checked gloi */
hii, /* error-checked ghii, lifted if needed */
@@ -795,6 +796,9 @@
simplifies implementing arithmetic and comparisons given how indices wrap around in
point loops */
int slo, shi, svi; /* signed versions of loi, hii, vvi */
+ int iplus, imnus; /* for scale=0 discrete differences */
+ const double *xyC, *xyP, *xyM;
+ double rt0[2], lt0[2];
if (!((lt || vv || rt) && fctx && lpnt)) {
biffAddf(LIMN, "%s: got NULL pointer (or too many NULL pointers)", me);
@@ -824,30 +828,37 @@
slo = AIR_INT(loi);
shi = AIR_INT(hii);
svi = AIR_INT(vvi);
+ /* DIM=2 through-out */
+ iplus = svi + 1;
+ imnus = svi - 1;
+ if (slo < shi) { /* bounded */
+ iplus = AIR_CLAMP(slo, iplus, shi);
+ imnus = AIR_CLAMP(slo, imnus, shi);
+ }
+ xyM = PPlowerI(lpnt, imnus);
+ xyC = PPlowerI(lpnt, svi);
+ xyP = PPlowerI(lpnt, iplus);
+ subnorm2(lt0, xyM, oneSided ? xyC : xyP);
+ subnorm2(rt0, xyP, oneSided ? xyC : xyM);
+ if (tvt0) {
+ ELL_2V_COPY(tvt0 + 0, lt0);
+ ELL_2V_COPY(tvt0 + 2, xyC);
+ ELL_2V_COPY(tvt0 + 4, rt0);
+ }
if (0 == fctx->scale) {
- /* DIM=2 through-out */
- const double *xyC, *xyP, *xyM;
- int iplus = svi + 1, imnus = svi - 1;
- if (slo < shi) { /* bounded */
- iplus = AIR_CLAMP(slo, iplus, shi);
- imnus = AIR_CLAMP(slo, imnus, shi);
- }
- xyM = PPlowerI(lpnt, imnus);
- xyC = PPlowerI(lpnt, svi);
- xyP = PPlowerI(lpnt, iplus);
if (fctx->verbose > 1) {
- printf("%s: %d | %d | %d --> (%g,%g)|(%g,%g)|(%g,%g)\n", me, imnus, svi, iplus,
- xyM[0], xyM[1], xyC[0], xyC[1], xyP[0], xyP[1]);
+ printf("%s: (-) %d | %d | (+) %d --> (%g,%g)|(%g,%g)|(%g,%g)\n", me, imnus, svi,
+ iplus, xyM[0], xyM[1], xyC[0], xyC[1], xyP[0], xyP[1]);
}
+ if (lt) {
+ ELL_2V_COPY(lt, lt0);
+ }
if (vv) {
ELL_2V_COPY(vv, xyC);
}
if (rt) {
- subnorm2(rt, xyP, oneSided ? xyC : xyM);
+ ELL_2V_COPY(rt, rt0);
}
- if (lt) {
- subnorm2(lt, xyM, oneSided ? xyC : xyP);
- }
} else {
/* using scale>0 for endpoint and tangent estimation */
/* for simplicity: regardless of dir, we compute average positions for points
@@ -1209,7 +1220,7 @@
CBD1(splTan, vv0, vv1, vv2, vv3, um, ww);
ELL_2V_NORM(splTan, splTan, tmp);
/* we emulate how tangent estimation would happen if had decided to split at midi */
- if (limnCbfTVT(NULL, NULL, midTan, fctx, lpnt, loi, hii, midi,
+ if (limnCbfTVT(NULL, NULL, midTan, NULL, fctx, lpnt, loi, hii, midi,
AIR_FALSE /* NOT oneSided */)) {
biffAddf(LIMN, "%s: trying to get middle tangent at %u in [%u,%u]", me, midi, loi,
hii);
@@ -1457,7 +1468,7 @@
biffAddf(LIMN, "%s: can handle loi=hii only with point loop", me);
return 1;
}
- if (limnCbfTVT(t2c, v0c, t1c, /* */
+ if (limnCbfTVT(t2c, v0c, t1c, NULL, /* */
fctx, lpnt, loi, hii, loi, /* */
AIR_FALSE /* NOT oneSided */)) {
biffAddf(LIMN, "%s: trouble finding two-sided geometry info", me);
@@ -1466,10 +1477,10 @@
ELL_2V_COPY(v3c, v0c);
} else {
/* loi < hii */
- if (limnCbfTVT(NULL, v0c, t1c, /* */
+ if (limnCbfTVT(NULL, v0c, t1c, NULL, /* */
fctx, lpnt, loi, hii, loi, /* */
AIR_TRUE /* yes oneSided */)
- || limnCbfTVT(t2c, v3c, NULL, /* */
+ || limnCbfTVT(t2c, v3c, NULL, NULL, /* */
fctx, lpnt, loi, hii, hii, /* */
AIR_TRUE /* yes oneSided */)) {
biffAddf(LIMN, "%s: trouble finding one-sided geometry info", me);
@@ -1598,9 +1609,9 @@
return 1;
}
hii = pnum - 1;
- if (limnCbfTVT(fctx->ctvt + 0, fctx->ctvt + 2, fctx->ctvt + 4, /* */
+ if (limnCbfTVT(fctx->ctvt + 0, fctx->ctvt + 2, fctx->ctvt + 4, NULL, /* */
fctx, lpnt, 0, hii, 0, AIR_TRUE /* yes oneSided */)
- || limnCbfTVT(fctx->ctvt + 6, fctx->ctvt + 8, fctx->ctvt + 10, /* */
+ || limnCbfTVT(fctx->ctvt + 6, fctx->ctvt + 8, fctx->ctvt + 10, NULL, /* */
fctx, lpnt, 0, hii, hii, AIR_TRUE /* yes oneSided */)) {
biffAddf(LIMN, "%s: trouble with tangents or vertices for endpoints", me);
return 1;
@@ -1640,6 +1651,7 @@
double *LT = vtvt + 0 + 6 * vi;
double *VV = vtvt + 2 + 6 * vi;
double *RT = vtvt + 4 + 6 * vi;
+ double tvt0[6];
/* we find TVT for *every* vertex, despite this seeming like computational overkill.
Why: we don't know which vertex might be corner until we look at the
tangent-to-tangent angles for EVERY vertex, for which we don't need to know the
@@ -1648,7 +1660,7 @@
revisit the input data (used previously for tangent estimation) to figure out the
corner vertices. In a non-loop, we know first and last points will be corners, but we
still need to find the vertex pos and (one-sided) tangent. */
- if (limnCbfTVT(LT, VV, RT, fctx, lpnt, 0 /* loi */, 0 /* hii */, vi,
+ if (limnCbfTVT(LT, VV, RT, tvt0, fctx, lpnt, 0 /* loi */, 0 /* hii */, vi,
AIR_TRUE /* yes oneSided */)) {
biffAddf(LIMN, "%s: trouble with tangents or vertices for point %u/%u", me, vi,
pnum);
@@ -1665,8 +1677,7 @@
angle[vi] = 180 * ell_2v_angle_d(LT, RT) / AIR_PI;
if (fctx->cornerCB) {
double tvtNew[6];
- if (fctx->cornerCB(tvtNew, fctx, angle[vi], vtvt + 0 + 6 * vi,
- PPlowerI(lpnt, vi))) {
+ if (fctx->cornerCB(tvtNew, fctx, angle[vi], vtvt + 0 + 6 * vi, tvt0)) {
corny[vi] = AIR_TRUE;
ELL_6V_COPY(vtvt + 0 + 6 * vi, tvtNew);
} else {
@@ -1838,7 +1849,7 @@
recDepth, fctx->distMax, fctx->distBig, midi, (pp + 2 * midi)[0],
(pp + 2 * midi)[1]);
}
- if (limnCbfTVT(TL, VM, TR, /* */
+ if (limnCbfTVT(TL, VM, TR, NULL, /* */
fctx, lpnt, loi, hii, midi, /* */
AIR_FALSE /* NOT oneSided */)
|| limnCbfMulti(path, V0, T1, TL, VM, recDepth + 1, &fctxL, lpnt, loi, midi)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
