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

fix selection error on datum exception

Browse Source 
and add user feedback for failed selections
This commit is contained in:
Stefan Tröger
2015-05-22 06:59:18 +02:00
parent b2d566379e
commit b4dd0072ab
7 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/PartDesign/App/DatumPoint.cpp
View File

@@ -310,7 +310,7 @@ void Point::onChanged(const App::Property* prop)
// Point from intersection of two curves
GeomAPI_ExtremaCurveCurve intersector(c1, c2);
if ((intersector.LowerDistance() > Precision::Confusion()) || (intersector.NbExtrema() == 0))
return; // No intersection
throw Base::Exception("Curve-Curve intersection failed"); // No intersection
// Note: We don't check for multiple intersection points
gp_Pnt p, p2;
intersector.Points(1, p, p2);
@@ -330,7 +330,7 @@ void Point::onChanged(const App::Property* prop)
// Intersect again
intersector = GeomAPI_ExtremaCurveCurve(c1, c2);
if ((intersector.LowerDistance() > Precision::Confusion()) || (intersector.NbExtrema() == 0))
return; // No intersection
throw Base::Exception("Curve-Curve intersection failed"); // No intersection
// Note: We don't check for multiple intersection points
intersector.Points(1, p, p2);
}
@@ -339,7 +339,7 @@ void Point::onChanged(const App::Property* prop)
} else if (!s1.IsNull()) {
GeomAPI_IntCS intersector(c1, s1);
if (!intersector.IsDone() || (intersector.NbPoints() == 0))
return;
throw Base::Exception("Curve-Surface intersection failed");
if (intersector.NbPoints() > 1)
Base::Console().Warning("More than one intersection point for datum point from curve and surface\n");