kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Sketcher] Use tangent at B-spline knot constraint

Browse Source 
Also squashes:

[Sketcher] Make tangent-at-knot with just knot and line

[Sketcher] Disallow tangent at C0 knot

If passed on to planegcs can cause segmentation fault.

[Sketcher] (Re-)Support tangent at B-spline end-knots

New code had introduced problems for non-periodic spline end-points, and
periodic spline "end-points" were not supported anyway.

(here end-points mean star/end points)
This commit is contained in:
Ajinkya Dahale
2022-09-21 20:26:56 +05:30
committed by Chris Hennes
parent 4c71957a97
commit 75f2a1d69a
4 changed files with 94 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Mod/Sketcher/App/Sketch.cpp
View File

@@ -2454,6 +2454,48 @@ int Sketch::addAngleAtPointConstraint(
if(avp)
geoId3 = checkGeoId(geoId3);
if ((Geoms[geoId1].type == BSpline && Geoms[geoId2].type == Line) ||
(Geoms[geoId1].type == Line && Geoms[geoId2].type == BSpline)) {
if (cTyp == Tangent) {
if (Geoms[geoId1].type == Line && Geoms[geoId2].type == BSpline) {
std::swap(geoId1, geoId2);
std::swap(pos1, pos2);
}
GCS::BSpline &b = BSplines[Geoms[geoId1].index];
GCS::Line &l = Lines[Geoms[geoId2].index];
size_t knotindex = b.knots.size();
if (avp) {
auto knotIt = std::find(b.knotpointGeoids.begin(),
b.knotpointGeoids.end(), geoId3);
knotindex =
std::distance(b.knotpointGeoids.begin(), knotIt);
}
else {
knotindex = (pos1 == PointPos::start) ? 0 : (b.knots.size() - 1);
}
if (knotindex >= b.knots.size())
return -1;
if (b.mult[knotindex] >= b.degree) {
// Leave handling of start/end of non-periodic B-splines to legacy code
if (b.periodic ||
(pos1 != PointPos::start && pos1 != PointPos::end)) {
Base::Console().Error("addAngleAtPointConstraint: cannot set constraint when B-spline slope is discontinuous at knot!\n");
return -1;
}
}
else {
int tag;
if(e2c)
tag = Sketch::addPointOnObjectConstraint(geoId1, pos1, geoId2, driving);//increases ConstraintsCounter
else
tag = ++ConstraintsCounter;
GCSsys.addConstraintTangentAtBSplineKnot(b, l, knotindex, tag, driving);
return ConstraintsCounter;
}
}
}
if (Geoms[geoId1].type == Point ||
Geoms[geoId2].type == Point){
Base::Console().Error("addAngleAtPointConstraint: one of the curves is a point!\n");