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

[Sketcher] Visualize B-spline in edit mode

Browse Source 
Instead of the control polygon, or "join the dots" for interpolated splines.
This commit is contained in:
Ajinkya Dahale
2024-01-05 20:54:31 +05:30
committed by Chris Hennes
parent a4c55b9ec8
commit 04bc6f8006
2 changed files with 62 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h
View File

@@ -90,7 +90,7 @@ public:
}
else if (Mode == STATUS_SEEK_ADDITIONAL_CONTROLPOINTS) {
drawControlPolygonToPosition(onSketchPos);
drawBSplineToPosition(onSketchPos);
drawCursorToPosition(onSketchPos);
@@ -313,7 +313,7 @@ public:
// run this in the end to draw lines and position text
drawControlPolygonToPosition(prevCursorPosition);
drawBSplineToPosition(prevCursorPosition);
drawCursorToPosition(prevCursorPosition);
}
catch (const Base::Exception&) {
@@ -414,13 +414,50 @@ private:
void drawControlPolygonToPosition(Base::Vector2d position)
{
std::vector<Base::Vector2d> editcurve(BSplinePoles);
editcurve.push_back(position);
drawEdit(editcurve);
}
void drawBSplineToPosition(Base::Vector2d position)
{
std::vector<Base::Vector3d> editcurve;
for (auto& pole : BSplinePoles) {
editcurve.emplace_back(pole.x, pole.y, 0.0);
}
editcurve.emplace_back(position.x, position.y, 0.0);
size_t degree = std::min(editcurve.size() - 1, static_cast<size_t>(SplineDegree));
bool periodic = (ConstrMethod != 0);
std::vector<double> weights(editcurve.size(), 1.0);
std::vector<double> knots;
std::vector<int> mults;
if (!periodic) {
for (size_t i = 0; i < editcurve.size() - degree + 1; ++i) {
knots.push_back(i);
}
mults.resize(editcurve.size() - degree + 1, 1);
mults.front() = degree + 1;
mults.back() = degree + 1;
}
else {
for (size_t i = 0; i < editcurve.size() + 1; ++i) {
knots.push_back(i);
}
mults.resize(editcurve.size() + 1, 1);
}
// TODO: This maybe optimized by storing the spline as an attribute.
Part::GeomBSplineCurve editBSpline(editcurve, weights, knots, mults, degree, periodic);
editBSpline.setPoles(editcurve);
std::vector<Part::Geometry*> editBSplines;
editBSplines.push_back(&editBSpline);
drawEdit(editBSplines);
}
void drawCursorToPosition(Base::Vector2d position)
{
if (!BSplinePoles.empty()) {

25
src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h
View File

@@ -90,7 +90,7 @@ public:
}
else if (Mode == STATUS_SEEK_ADDITIONAL_POINTS) {
drawControlPolygonToPosition(onSketchPos);
drawBSplineToPosition(onSketchPos);
drawCursorToPosition(onSketchPos);
@@ -311,7 +311,7 @@ public:
// run this in the end to draw lines and position text
drawControlPolygonToPosition(prevCursorPosition);
drawBSplineToPosition(prevCursorPosition);
drawCursorToPosition(prevCursorPosition);
}
catch (const Base::Exception&) {
@@ -409,13 +409,32 @@ private:
// NOTE: In this context, it is not a control polygon, but a 1-degree interpolation
void drawControlPolygonToPosition(Base::Vector2d position)
{
std::vector<Base::Vector2d> editcurve(BSplineKnots);
editcurve.push_back(position);
drawEdit(editcurve);
}
void drawBSplineToPosition(Base::Vector2d position)
{
std::vector<Base::Vector2d> editcurve(BSplineKnots);
editcurve.push_back(position);
std::vector<gp_Pnt> editCurveForOCCT;
for (auto& p : editcurve) {
editCurveForOCCT.emplace_back(p.x, p.y, 0.0);
}
// TODO: This maybe optimized by storing the spline as an attribute.
Part::GeomBSplineCurve editBSpline;
editBSpline.interpolate(editCurveForOCCT, ConstrMethod != 0);
std::vector<Part::Geometry*> editBSplines;
editBSplines.push_back(&editBSpline);
drawEdit(editBSplines);
}
void drawCursorToPosition(Base::Vector2d position)
{
if (!BSplineKnots.empty()) {