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

Sketcher: Intercurve fillet Improvement and delete constraint on point fix

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

Intercurve fillet uses endpoint constraints for improved accuracy, but before this
commit was only considering a coincident constraint. Now it also considers an endpoint
tangency or perpendicular.

delConstraintOnPoint with coincidentonly=false, was not checking endpoint perpendiculars and
would therefore fail to delete them.

https://forum.freecadweb.org/viewtopic.php?f=3&t=31594&start=30#p265731
This commit is contained in:
Abdullah Tahiri
2018-11-01 16:10:29 +01:00
committed by Yorik van Havre
parent fe78c1a037
commit 69d62787eb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -1153,7 +1153,7 @@ int SketchObject::delConstraintOnPoint(int GeoId, PointPos PosId, bool onlyCoinc
continue; // skip this constraint
}
}
else if ((*it)->Type == Sketcher::Tangent) {
else if ((*it)->Type == Sketcher::Tangent || (*it)->Type == Sketcher::Perpendicular) {
if (((*it)->First == GeoId && (*it)->FirstPos == PosId) ||
((*it)->Second == GeoId && (*it)->SecondPos == PosId)) {
// we could keep the tangency constraint by converting it
@@ -1450,8 +1450,9 @@ int SketchObject::fillet(int GeoId1, int GeoId2,
const std::vector<Constraint *> &constraints = this->Constraints.getValues();
for (std::vector<Constraint *>::const_iterator it=constraints.begin(); it != constraints.end(); ++it) {
if ((*it)->Type == Sketcher::Coincident) {
if ((*it)->First == GeoId1 && (*it)->Second == GeoId2) {
if ((*it)->Type == Sketcher::Coincident || (*it)->Type == Sketcher::Perpendicular || (*it)->Type == Sketcher::Tangent) {
if ((*it)->First == GeoId1 && (*it)->Second == GeoId2 &&
(*it)->FirstPos != Sketcher::none && (*it)->SecondPos != Sketcher::none ) {
Base::Vector3d tmpp1 = getPoint((*it)->First,(*it)->FirstPos);
Base::Vector3d tmpp2 = getPoint((*it)->Second,(*it)->SecondPos);
double tmpdist = distancetorefpoints(tmpp1,
@@ -1465,7 +1466,8 @@ int SketchObject::fillet(int GeoId1, int GeoId2,
interpoints = std::make_pair(tmpp1,tmpp2);
}
}
else if ((*it)->First == GeoId2 && (*it)->Second == GeoId1) {
else if ((*it)->First == GeoId2 && (*it)->Second == GeoId1 &&
(*it)->FirstPos != Sketcher::none && (*it)->SecondPos != Sketcher::none ) {
Base::Vector3d tmpp2 = getPoint((*it)->First,(*it)->FirstPos);
Base::Vector3d tmpp1 = getPoint((*it)->Second,(*it)->SecondPos);
double tmpdist = distancetorefpoints(tmpp1,