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

fixes #0002512 Allow multi-face part design tools

Browse Source
This commit is contained in:
Stefan Tröger
2016-05-18 19:49:05 +02:00
committed by wmayer
parent 4f8973fe8e
commit 83ce80f133
16 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/PartDesign/App/FeatureRevolution.cpp
View File

@@ -131,8 +131,12 @@ App::DocumentObjectExecReturn *Revolution::execute(void)
sketchshape.Move(invObjLoc);
// Check distance between sketchshape and axis - to avoid failures and crashes
if (checkLineCrossesFace(gp_Lin(pnt, dir), TopoDS::Face(sketchshape)))
return new App::DocumentObjectExecReturn("Revolve axis intersects the sketch");
TopExp_Explorer xp;
xp.Init(sketchshape, TopAbs_FACE);
for (;xp.More(); xp.Next()) {
if (checkLineCrossesFace(gp_Lin(pnt, dir), TopoDS::Face(xp.Current())))
return new App::DocumentObjectExecReturn("Revolve axis intersects the sketch");
}
// revolve the face to a solid
BRepPrimAPI_MakeRevol RevolMaker(sketchshape, gp_Ax1(pnt, dir), angle);
@@ -153,7 +157,7 @@ App::DocumentObjectExecReturn *Revolution::execute(void)
result = refineShapeIfActive(result);
}
this->Shape.setValue(result);
this->Shape.setValue(getSolid(result));
}
else
return new App::DocumentObjectExecReturn("Could not revolve the sketch!");
@@ -164,7 +168,7 @@ App::DocumentObjectExecReturn *Revolution::execute(void)
Handle_Standard_Failure e = Standard_Failure::Caught();
if (std::string(e->GetMessageString()) == "TopoDS::Face")
return new App::DocumentObjectExecReturn("Could not create face from sketch.\n"
"Intersecting sketch entities or multiple faces in a sketch are not allowed.");
"Intersecting sketch entities in a sketch are not allowed.");
else
return new App::DocumentObjectExecReturn(e->GetMessageString());
}