diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index bb05599bf2..77250a34cc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -166,7 +166,7 @@ void ViewProviderPage::removeMDIView(void) void ViewProviderPage::updateData(const App::Property* prop) { auto page = getDrawPage(); - if(!page) { + if (!page) { Gui::ViewProviderDocumentObject::updateData(prop); return; } @@ -179,18 +179,18 @@ void ViewProviderPage::updateData(const App::Property* prop) signalChangeIcon(); //if the template is changed, rebuild the visual } else if (prop == &(page->Template)) { - if(m_mdiView && + if (m_mdiView && !page->isUnsetting()) { m_mdiView->matchSceneRectToTemplate(); m_mdiView->updateTemplate(); } } else if (prop == &(page->Label)) { - if(m_mdiView && + if (m_mdiView && !page->isUnsetting()) { m_mdiView->setTabText(page->Label.getValue()); } } else if (prop == &page->Views) { - if(m_mdiView && !page->isUnsetting()) + if (m_mdiView && !page->isUnsetting()) m_mdiView->fixOrphans(); } @@ -319,7 +319,7 @@ std::vector ViewProviderPage::claimChildren(void) const App::DocumentObject *templateFeat = 0; templateFeat = getDrawPage()->Template.getValue(); - if(templateFeat) { + if (templateFeat) { temp.push_back(templateFeat); } @@ -336,7 +336,7 @@ std::vector ViewProviderPage::claimChildren(void) const const std::vector &views = getDrawPage()->Views.getValues(); try { - for(std::vector::const_iterator it = views.begin(); it != views.end(); ++it) { + for (std::vector::const_iterator it = views.begin(); it != views.end(); ++it) { TechDraw::DrawView* featView = dynamic_cast (*it); App::DocumentObject *docObj = *it; //DrawRichAnno with no parent is child of Page @@ -351,14 +351,14 @@ std::vector ViewProviderPage::claimChildren(void) const } // Don't collect if dimension, projection group item, hatch or member of ClipGroup as these should be grouped elsewhere - if(docObj->isDerivedFrom(TechDraw::DrawProjGroupItem::getClassTypeId()) || - docObj->isDerivedFrom(TechDraw::DrawViewDimension::getClassTypeId()) || - docObj->isDerivedFrom(TechDraw::DrawHatch::getClassTypeId()) || - docObj->isDerivedFrom(TechDraw::DrawViewBalloon::getClassTypeId()) || - docObj->isDerivedFrom(TechDraw::DrawRichAnno::getClassTypeId()) || - docObj->isDerivedFrom(TechDraw::DrawLeaderLine::getClassTypeId()) || - docObj->isDerivedFrom(TechDraw::DrawWeldSymbol::getClassTypeId()) || - (featView && featView->isInClip()) ) + if (docObj->isDerivedFrom(TechDraw::DrawProjGroupItem::getClassTypeId()) || + docObj->isDerivedFrom(TechDraw::DrawViewDimension::getClassTypeId()) || + docObj->isDerivedFrom(TechDraw::DrawHatch::getClassTypeId()) || + docObj->isDerivedFrom(TechDraw::DrawViewBalloon::getClassTypeId()) || + docObj->isDerivedFrom(TechDraw::DrawRichAnno::getClassTypeId()) || + docObj->isDerivedFrom(TechDraw::DrawLeaderLine::getClassTypeId()) || + docObj->isDerivedFrom(TechDraw::DrawWeldSymbol::getClassTypeId()) || + (featView && featView->isInClip()) ) continue; else temp.push_back(*it); @@ -392,7 +392,7 @@ MDIViewPage* ViewProviderPage::getMDIViewPage() const void ViewProviderPage::onChanged(const App::Property *prop) { // if (prop == &(getDrawPage()->Template)) { -// if(m_mdiView) { +// if (m_mdiView) { // m_mdiView->updateTemplate(); // } // } @@ -479,7 +479,7 @@ bool ViewProviderPage::canDelete(App::DocumentObject *obj) const void ViewProviderPage::onGuiRepaint(const TechDraw::DrawPage* dp) { if (dp == getDrawPage()) { - if(!m_mdiView.isNull() && + if (!m_mdiView.isNull() && !getDrawPage()->isUnsetting()) { m_mdiView->fixOrphans(); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index 4cc643475a..4805d23b47 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -240,7 +240,7 @@ std::vector ViewProviderProjGroup::claimChildren(void) con std::vector temp; const std::vector &views = getObject()->Views.getValues(); try { - for(std::vector::const_iterator it = views.begin(); it != views.end(); ++it) { + for (std::vector::const_iterator it = views.begin(); it != views.end(); ++it) { temp.push_back(*it); } return temp; diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp index ef3224dc85..502d96afa1 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp @@ -118,7 +118,7 @@ void ViewProviderTemplate::onChanged(const App::Property *prop) } if (prop == &Visibility) { - if(Visibility.getValue()) { + if (Visibility.getValue()) { show(); } else { hide();