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

Prevent unnecessary error messages while loading a part

Browse Source
This commit is contained in:
jrheinlaender 2013-07-07 11:31:14 +02:00 committed by Stefan Tröger
parent 1e615043cd
commit 2d080dd92b
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
View File

@ -350,10 +350,12 @@ bool TaskDlgBooleanParameters::reject()
PartDesign::Boolean* obj = static_cast<PartDesign::Boolean*>(BooleanView->getObject());
Gui::Document* doc = Gui::Application::Instance->activeDocument();
if (doc != NULL) {
doc->setShow(obj->BaseFeature.getValue()->getNameInDocument());
std::vector<App::DocumentObject*> bodies = obj->Bodies.getValues();
for (std::vector<App::DocumentObject*>::const_iterator b = bodies.begin(); b != bodies.end(); b++)
doc->setShow((*b)->getNameInDocument());
if (obj->BaseFeature.getValue() != NULL) {
doc->setShow(obj->BaseFeature.getValue()->getNameInDocument());
std::vector<App::DocumentObject*> bodies = obj->Bodies.getValues();
for (std::vector<App::DocumentObject*>::const_iterator b = bodies.begin(); b != bodies.end(); b++)
doc->setShow((*b)->getNameInDocument());
}
}
// roll back the done things

4
src/Mod/PartDesign/Gui/ViewProviderGroove.cpp
View File

@ -54,7 +54,9 @@ ViewProviderGroove::~ViewProviderGroove()
std::vector<App::DocumentObject*> ViewProviderGroove::claimChildren(void)const
{
std::vector<App::DocumentObject*> temp;
temp.push_back(static_cast<PartDesign::Groove*>(getObject())->Sketch.getValue());
App::DocumentObject* sketch = static_cast<PartDesign::Groove*>(getObject())->Sketch.getValue();
if (sketch != NULL)
temp.push_back(sketch);
return temp;
}

4
src/Mod/PartDesign/Gui/ViewProviderPad.cpp
View File

@ -55,7 +55,9 @@ ViewProviderPad::~ViewProviderPad()
std::vector<App::DocumentObject*> ViewProviderPad::claimChildren(void)const
{
std::vector<App::DocumentObject*> temp;
temp.push_back(static_cast<PartDesign::Pad*>(getObject())->Sketch.getValue());
App::DocumentObject* sketch = static_cast<PartDesign::Pad*>(getObject())->Sketch.getValue();
if (sketch != NULL)
temp.push_back(sketch);
return temp;
}

4
src/Mod/PartDesign/Gui/ViewProviderPocket.cpp
View File

@ -54,7 +54,9 @@ ViewProviderPocket::~ViewProviderPocket()
std::vector<App::DocumentObject*> ViewProviderPocket::claimChildren(void)const
{
std::vector<App::DocumentObject*> temp;
temp.push_back(static_cast<PartDesign::Pocket*>(getObject())->Sketch.getValue());
App::DocumentObject* sketch = static_cast<PartDesign::Pocket*>(getObject())->Sketch.getValue();
if (sketch != NULL)
temp.push_back(sketch);
return temp;
}

4
src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp
View File

@ -54,7 +54,9 @@ ViewProviderRevolution::~ViewProviderRevolution()
std::vector<App::DocumentObject*> ViewProviderRevolution::claimChildren(void)const
{
std::vector<App::DocumentObject*> temp;
temp.push_back(static_cast<PartDesign::Revolution*>(getObject())->Sketch.getValue());
App::DocumentObject* sketch = static_cast<PartDesign::Revolution*>(getObject())->Sketch.getValue();
if (sketch != NULL)
temp.push_back(sketch);
return temp;
}