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

Changed tree ordering of booleans and bodies

Browse Source
This commit is contained in:
jrheinlaender
2013-05-24 08:23:04 +04:30
committed by Stefan Tröger
parent 106efeec02
commit 026242231e
8 changed files with 104 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mod/PartDesign/App/FeatureBoolean.cpp
View File

@@ -60,33 +60,36 @@ short Boolean::mustExecute() const
App::DocumentObjectExecReturn *Boolean::execute(void)
{
// Get the base shape to operate on
Part::TopoShape baseTopShape;
try {
baseTopShape = getBaseTopoShape();
} catch (const Base::Exception&) {
return new App::DocumentObjectExecReturn("Cannot do boolean operation with invalid base shape");
}
std::vector<App::DocumentObject*> bodies = Bodies.getValues();
if (bodies.empty())
return App::DocumentObject::StdReturn;
// Get the first body
if (bodies.front() == NULL)
return new App::DocumentObjectExecReturn("No body for boolean");
PartDesign::Body* body = static_cast<PartDesign::Body*>(bodies.front());
const Part::TopoShape& bodyTopShape = body->Shape.getShape();
if (bodyTopShape._Shape.IsNull())
return new App::DocumentObjectExecReturn("Cannot do boolean operation on invalid body shape");
// create an untransformed copy of the body shape
Part::TopoShape bodyShape(bodyTopShape);
bodyShape.setTransform(Base::Matrix4D());
TopoDS_Shape result = bodyShape._Shape;
// create an untransformed copy of the base shape
Part::TopoShape baseShape(baseTopShape);
baseShape.setTransform(Base::Matrix4D());
TopoDS_Shape result = baseShape._Shape;
// Position this feature by the first body
this->Placement.setValue(body->Placement.getValue());
const Part::Feature* baseFeature;
try {
baseFeature = getBaseObject();
} catch (const Base::Exception&) {
return new App::DocumentObjectExecReturn("Cannot do boolean operation with invalid BaseFeature");
}
this->Placement.setValue(baseFeature->Placement.getValue());
// Get the operation type
std::string type = Type.getValueAsString();
std::vector<App::DocumentObject*>::const_iterator b = bodies.begin();
b++;
for (; b != bodies.end(); b++)
for (std::vector<App::DocumentObject*>::const_iterator b = bodies.begin(); b != bodies.end(); b++)
{
// Extract the body shape
PartDesign::Body* body = static_cast<PartDesign::Body*>(*b);