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

Part: Geometry - improvements/bug fixes

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

routine for closest parameter to point was failing on endpoints. The former version
used the parameter of the basis curve, which sometimes was giving parameter values
incoherent. This version uses distance to endpoints when a projection on the trimmed
curve can not be found.
This commit is contained in:
Abdullah Tahiri
2018-10-15 16:52:38 +02:00
committed by wmayer
parent 8a134466ed
commit 90ae032d6d
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/Part/App/Geometry.cpp
View File

@@ -478,10 +478,13 @@ bool GeomCurve::intersect( GeomCurve * c,
return points.size()>0?true:false;
}
else
return false;
}
catch (Standard_Failure& e) {
return false;
}
}
bool GeomCurve::closestParameter(const Base::Vector3d& point, double &u) const
@@ -495,13 +498,19 @@ bool GeomCurve::closestParameter(const Base::Vector3d& point, double &u) const
return true;
}
}
catch (StdFail_NotDone&) { // projection does not exist on trimmer curve, let's try basis curve
closestParameterToBasicCurve(point,u);
catch (StdFail_NotDone& e) {
if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))){
Base::Vector3d firstpoint = this->pointAtParameter(c->FirstParameter());
Base::Vector3d lastpoint = this->pointAtParameter(c->LastParameter());
if(std::abs(u-c->FirstParameter()) < std::abs(u-c->LastParameter()))
u = c->FirstParameter();
if((firstpoint-point).Length() < (lastpoint-point).Length())
u = c->FirstParameter();
else
u = c->LastParameter();
}
else
u = c->LastParameter();
throw Base::RuntimeError(e.GetMessageString());
return true;
}
@@ -551,7 +560,6 @@ double GeomCurve::getFirstParameter() const
throw Base::RuntimeError(e.GetMessageString());
}
}
double GeomCurve::getLastParameter() const
@@ -565,7 +573,7 @@ double GeomCurve::getLastParameter() const
catch (Standard_Failure& e) {
throw Base::RuntimeError(e.GetMessageString());
}
}
}
double GeomCurve::curvatureAt(double u) const
@@ -1665,6 +1673,7 @@ bool GeomArcOfConic::intersectBasisCurves( const GeomArcOfConic * c,
return points.size()>0?true:false;
}
return false;
}
catch (Standard_Failure& e) {
return false;