fix CIDs 151701, 151747
This commit is contained in:
parent
df8f7cfb7e
commit
0ada809ec5
|
@ -154,7 +154,6 @@ short DrawPage::mustExecute() const
|
||||||
|
|
||||||
// Check if within this Page, any Views have been touched
|
// Check if within this Page, any Views have been touched
|
||||||
// Why does Page have to execute if a View changes?
|
// Why does Page have to execute if a View changes?
|
||||||
bool ViewsTouched = false;
|
|
||||||
const std::vector<App::DocumentObject*> &vals = Views.getValues();
|
const std::vector<App::DocumentObject*> &vals = Views.getValues();
|
||||||
for(std::vector<App::DocumentObject *>::const_iterator it = vals.begin(); it < vals.end(); ++it) {
|
for(std::vector<App::DocumentObject *>::const_iterator it = vals.begin(); it < vals.end(); ++it) {
|
||||||
if((*it)->isTouched()) {
|
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)
|
PyObject *DrawPage::getPyObject(void)
|
||||||
|
|
|
@ -296,9 +296,9 @@ void QGIViewPart::updateView(bool update)
|
||||||
QList<QGraphicsItem*> items = childItems();
|
QList<QGraphicsItem*> items = childItems();
|
||||||
for(QList<QGraphicsItem*>::iterator it = items.begin(); it != items.end(); ++it) {
|
for(QList<QGraphicsItem*>::iterator it = items.begin(); it != items.end(); ++it) {
|
||||||
QGIEdge *edge = dynamic_cast<QGIEdge *>(*it);
|
QGIEdge *edge = dynamic_cast<QGIEdge *>(*it);
|
||||||
if(edge && edge->getHiddenEdge()) {
|
if(edge && edge->getHiddenEdge()) {
|
||||||
edge->setWidth(viewPart->HiddenWidth.getValue() * lineScaleFactor);
|
edge->setWidth(viewPart->HiddenWidth.getValue() * lineScaleFactor);
|
||||||
} else {
|
} else if (edge){
|
||||||
edge->setWidth(viewPart->LineWidth.getValue() * lineScaleFactor);
|
edge->setWidth(viewPart->LineWidth.getValue() * lineScaleFactor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user