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

Update Page display when View removed.

Browse Source 
- if a View is removed from a Page, but not from
  the document, its graphic remains on the display.
  This change checks if graphic has an associated
  View on this Page.
This commit is contained in:
wandererfan
2018-04-08 20:02:56 -04:00
committed by wmayer
parent 371c7e4588
commit 00f36d78e4
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/TechDraw/Gui/MDIViewPage.cpp
View File

@@ -374,16 +374,8 @@ void MDIViewPage::updateDrawing(bool forceUpdate)
{
// get all the DrawViews for this page, including the second level ones
// if we ever have collections of collections, we'll need to revisit this
std::vector<App::DocumentObject*> pChildren = m_vpPage->getDrawPage()->Views.getValues();
std::vector<App::DocumentObject*> appendChildren;
for (auto& pc: pChildren) {
if(pc->getTypeId().isDerivedFrom(TechDraw::DrawViewCollection::getClassTypeId())) {
TechDraw::DrawViewCollection *collect = dynamic_cast<TechDraw::DrawViewCollection *>(pc);
std::vector<App::DocumentObject*> cChildren = collect->Views.getValues();
appendChildren.insert(std::end(appendChildren), std::begin(cChildren), std::end(cChildren));
}
}
pChildren.insert(std::end(pChildren),std::begin(appendChildren),std::end(appendChildren));
DrawPage* thisPage = m_vpPage->getDrawPage();
std::vector<App::DocumentObject*> pChildren = thisPage->getAllViews();
// if dv doesn't have a graphic, make one
for (auto& dv: pChildren) {
@@ -396,13 +388,18 @@ void MDIViewPage::updateDrawing(bool forceUpdate)
}
}
// if qView doesn't have a Feature, delete it
// if qView doesn't have a Feature on this Page, delete it
std::vector<QGIView*> qvs = m_view->getViews();
App::Document* doc = getAppDocument();
for (auto& qv: qvs) {
App::DocumentObject* obj = doc->getObject(qv->getViewName());
if (obj == nullptr) {
m_view->removeQView(qv);
} else {
DrawPage* pp = qv->getViewObject()->findParentPage();
if (thisPage != pp) {
m_view->removeQView(qv);
}
}
}