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

Sketcher: Improved ViewProvider visualisation for non-rational Bsplines with non-unitary weight constraints

Browse Source 
===========================================================================================================

OCCT forces weights of non-rationa Bsplines to be 1.0

In the presence of non-unitary weight constraints, the weight representation (constraint) has a different radius
than the circle.

This commit fixes this behaviour, by forcing the circle to match the weight constraint.

The information layer still reports OCCT weights being 1.0, but the visual artifact is fixed.
This commit is contained in:
Abdullah Tahiri
2021-02-18 17:24:56 +01:00
parent 6d0c845208
commit de7ae73915
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -3985,8 +3985,32 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer
// proportional to the length of the bspline
// inversely proportional to the number of poles
double scalefactor = bspline->length(bspline->getFirstParameter(), bspline->getLastParameter())/10.0/weights.size();
//double scalefactor = getScaleFactor();
double vradius = weight*scalefactor;
if(!bspline->isRational()) {
// OCCT sets the weights to 1.0 if a bspline is non-rational, but if the user has a weight constraint on any
// pole it would cause a visual artifact of having a constraint with a different radius and an unscaled circle
// so better scale the circles.
std::vector<int> polegeoids;
polegeoids.reserve(weights.size());
for ( auto ic : getSketchObject()->Constraints.getValues()) {
if( ic->Type == InternalAlignment && ic->AlignmentType == BSplineControlPoint && ic->Second == c->Second) {
polegeoids.push_back(ic->First);
}
}
for ( auto ic : getSketchObject()->Constraints.getValues()) {
if( ic->Type == Weight ) {
auto pos = std::find(polegeoids.begin(), polegeoids.end(), ic->First);
if(pos != polegeoids.end()) {
vradius = ic->getValue() * scalefactor;
break; // one is enough, otherwise it would not be non-rational
}
}
}
}
// virtual circle or radius vradius
auto mcurve = [&center, vradius](double param, double &x, double &y) {