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

add option to getBodyFor to suppress dialog to set workflow style to modern

Browse Source
This commit is contained in:
wmayer
2018-01-03 21:35:03 +01:00
parent 22b117fd83
commit d24379d822
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/PartDesign/Gui/Utils.cpp
View File

@@ -67,7 +67,7 @@ namespace PartDesignGui {
* \param autoActivate
* \return Body
*/
PartDesign::Body *getBody(bool messageIfNot, bool autoActivate)
PartDesign::Body *getBody(bool messageIfNot, bool autoActivate, bool assertModern)
{
PartDesign::Body * activeBody = nullptr;
Gui::MDIView *activeView = Gui::Application::Instance->activeView();
@@ -75,7 +75,7 @@ PartDesign::Body *getBody(bool messageIfNot, bool autoActivate)
if (activeView) {
bool singleBodyDocument = activeView->getAppDocument()->
countObjectsOfType(PartDesign::Body::getClassTypeId()) == 1;
if ( PartDesignGui::assureModernWorkflow ( activeView->getAppDocument() ) ) {
if (assertModern && PartDesignGui::assureModernWorkflow ( activeView->getAppDocument() ) ) {
activeBody = activeView->getActiveObject<PartDesign::Body*>(PDBODYKEY);
if (!activeBody && singleBodyDocument && autoActivate) {
@@ -122,12 +122,13 @@ PartDesign::Body * makeBody(App::Document *doc)
return activeView->getActiveObject<PartDesign::Body*>(PDBODYKEY);
}
PartDesign::Body *getBodyFor(const App::DocumentObject* obj, bool messageIfNot, bool autoActivate)
PartDesign::Body *getBodyFor(const App::DocumentObject* obj, bool messageIfNot,
bool autoActivate, bool assertModern)
{
if(!obj)
return nullptr;
PartDesign::Body * rv = getBody(/*messageIfNot =*/false, autoActivate);
PartDesign::Body * rv = getBody(/*messageIfNot =*/false, autoActivate, assertModern);
if (rv && rv->hasObject(obj))
return rv;