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

Sketcher: Bspline solver knot support - unfinished

Browse Source
This commit is contained in:
Abdullah Tahiri
2017-02-23 23:00:17 +01:00
committed by wmayer
parent 98baf57e18
commit c46c66d48a
5 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1244,6 +1244,8 @@ int Sketch::addConstraint(const Constraint *constraint)
break;
case BSplineControlPoint:
rtn = addInternalAlignmentBSplineControlPoint(constraint->First,constraint->Second, constraint->InternalAlignmentIndex);
case BSplineKnotPoint:
rtn = addInternalAlignmentKnotPoint(constraint->First,constraint->Second, constraint->InternalAlignmentIndex);
default:
break;
}
@@ -2469,6 +2471,32 @@ int Sketch::addInternalAlignmentBSplineControlPoint(int geoId1, int geoId2, int
return -1;
}
int Sketch::addInternalAlignmentKnotPoint(int geoId1, int geoId2, int knotindex)
{
std::swap(geoId1, geoId2);
geoId1 = checkGeoId(geoId1);
geoId2 = checkGeoId(geoId2);
if (Geoms[geoId1].type != BSpline)
return -1;
if (Geoms[geoId2].type != Point)
return -1;
int pointId1 = getPointId(geoId2, start);
if (pointId1 >= 0 && pointId1 < int(Points.size())) {
GCS::Point &p = Points[pointId1];
GCS::BSpline &b = BSplines[Geoms[geoId1].index];
int tag = ++ConstraintsCounter;
GCSsys.addConstraintInternalAlignmentBSplineKnot(b, p, knotindex, tag);
return ConstraintsCounter;
}
return -1;
}
double Sketch::calculateAngleViaPoint(int geoId1, int geoId2, double px, double py)
{
geoId1 = checkGeoId(geoId1);