suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PartDesign: remove Body::isFeature() because it's the same as BodyBase::hasFeature()

Browse Source
This commit is contained in:
Alexander Golubev 2015-06-28 07:40:30 +03:00 committed by Stefan Tröger
parent 36fe5994b9
commit f4a5bf6acd
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/PartDesign/App/Body.cpp
View File

@ -327,16 +327,6 @@ void Body::removeFeature(App::DocumentObject* feature)
Model.setValues(model);
}
bool Body::isFeature(App::DocumentObject* feature)
{
for(App::DocumentObject* obj : Model.getValues()) {
if(obj == feature)
return true;
}
return false;
}
App::DocumentObjectExecReturn *Body::execute(void)
{

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

@ -85,10 +85,11 @@ App::DocumentObjectExecReturn *Boolean::execute(void)
if (baseTopShape._Shape.IsNull())
return new App::DocumentObjectExecReturn("Cannot do boolean operation with invalid base shape");
// TODO: move PartDesignGui::getBodyFor() from Gui to App and use it here
//get the body this boolean feature belongs to
PartDesign::Body* baseBody = NULL;
for(PartDesign::Body* b : this->getDocument()->getObjectsOfType<PartDesign::Body>()) {
if(b->isFeature(this)) {
if(b->hasFeature(this)) {
baseBody = b;
break;
}

2
src/Mod/PartDesign/Gui/Workbench.cpp
View File

@ -100,7 +100,7 @@ PartDesign::Body *getBodyFor(App::DocumentObject* obj, bool messageIfNot)
//try to find the part the object is in
for(PartDesign::Body* b : obj->getDocument()->getObjectsOfType<PartDesign::Body>()) {
if(b->isFeature(obj)) {
if(b->hasFeature(obj)) {
return b;
}
}