From 0ada809ec55b9167ba459f8d42ca3fc01d81b9df Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 18 Dec 2016 13:46:26 +0100 Subject: [PATCH] fix CIDs 151701, 151747 --- src/Mod/TechDraw/App/DrawPage.cpp | 3 +-- src/Mod/TechDraw/Gui/QGIViewPart.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawPage.cpp b/src/Mod/TechDraw/App/DrawPage.cpp index 336279bda..86a8ff2c3 100644 --- a/src/Mod/TechDraw/App/DrawPage.cpp +++ b/src/Mod/TechDraw/App/DrawPage.cpp @@ -154,7 +154,6 @@ short DrawPage::mustExecute() const // Check if within this Page, any Views have been touched // Why does Page have to execute if a View changes? - bool ViewsTouched = false; const std::vector &vals = Views.getValues(); for(std::vector::const_iterator it = vals.begin(); it < vals.end(); ++it) { if((*it)->isTouched()) { @@ -162,7 +161,7 @@ short DrawPage::mustExecute() const } } - return (ViewsTouched) ? 1 : App::DocumentObject::mustExecute(); + return App::DocumentObject::mustExecute(); } PyObject *DrawPage::getPyObject(void) diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp index 61507e362..cd17e5903 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp @@ -296,9 +296,9 @@ void QGIViewPart::updateView(bool update) QList items = childItems(); for(QList::iterator it = items.begin(); it != items.end(); ++it) { QGIEdge *edge = dynamic_cast(*it); - if(edge && edge->getHiddenEdge()) { + if(edge && edge->getHiddenEdge()) { edge->setWidth(viewPart->HiddenWidth.getValue() * lineScaleFactor); - } else { + } else if (edge){ edge->setWidth(viewPart->LineWidth.getValue() * lineScaleFactor); } }