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 7cb6606dc2
commit d3a7e9a928
7 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/PartDesign/App/DatumLine.cpp
View File

@@ -159,14 +159,14 @@ void Line::onChanged(const App::Property *prop)
std::vector<App::DocumentObject*> refs = References.getValues();
std::vector<std::string> refnames = References.getSubValues();
if (refs.size() != refnames.size())
return;
throw Base::Exception("Reference Missmatch");
for (int r = 0; r < refs.size(); r++)
refTypes.insert(getRefType(refs[r], refnames[r]));
std::set<QString> hint = getHint();
if (!((hint.size() == 1) && (hint.find(QObject::tr("Done")) != hint.end())))
return; // incomplete references
throw Base::Exception("Incomplete References"); // incomplete references
// Extract the geometry of the references
Base::Vector3d* base = NULL;
@@ -226,7 +226,7 @@ void Line::onChanged(const App::Property *prop)
// Create plane through line normal to s1
Handle_Geom_Plane pl = Handle_Geom_Plane::DownCast(s1);
if (pl.IsNull())
return; // Non-planar first surface
throw Base::Exception("Non-planar first surface"); // Non-planar first surface
gp_Dir normal = ldir.Crossed(pl->Axis().Direction());
double offset1 = Offset.getValue();
double offset2 = Offset2.getValue();
@@ -375,7 +375,7 @@ void Line::onChanged(const App::Property *prop)
// Line from two surfaces
GeomAPI_IntSS intersectorSS(s1, s2, Precision::Confusion());
if (!intersectorSS.IsDone() || (intersectorSS.NbLines() == 0))
return;
throw Base::Exception("Intersection of surfaces failed");
if (intersectorSS.NbLines() > 1)
Base::Console().Warning("More than one intersection curve for datum line from surfaces\n");
Handle_Geom_Line l = Handle_Geom_Line::DownCast(intersectorSS.Line(1));