From fb397e0f8be728ae195267fa38e4e1976bccdcb2 Mon Sep 17 00:00:00 2001 From: WandererFan Date: Mon, 4 Jul 2016 10:55:09 -0400 Subject: [PATCH] Dimension Precision property does not update VPs updateData doesn't call parent --- src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 10 +++------- src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderDimension.cpp | 1 + src/Mod/TechDraw/Gui/ViewProviderHatch.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp | 1 + 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index ebfda0cfa2..eca10e8ed0 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -246,27 +246,22 @@ void QGIViewDimension::updateView(bool update) return; TechDraw::DrawViewDimension *dim = dynamic_cast(getViewObject()); - std::vector refs = dim->References2D.getValues(); - QGIDatumLabel *dLabel = dynamic_cast(datumLabel); // Identify what changed to prevent complete redraw if(dim->Fontsize.isTouched() || dim->Font.isTouched()) { - - QFont font = dLabel->font(); font.setPointSizeF(dim->Fontsize.getValue()); //scene units (mm), not points font.setFamily(QString::fromAscii(dim->Font.getValue())); dLabel->setFont(font); dLabel->setLabelCenter(); - + updateDim(); } else if(dim->X.isTouched() || dim->Y.isTouched()) { dLabel->setPosFromCenter(dim->X.getValue(), dim->Y.getValue()); updateDim(); - } else { updateDim(); } @@ -282,7 +277,6 @@ void QGIViewDimension::updateDim() return; const TechDraw::DrawViewDimension *dim = dynamic_cast(getViewObject()); - QString labelText = QString::fromStdString(dim->getFormatedValue()); QGIDatumLabel *dLabel = dynamic_cast(datumLabel); @@ -1262,6 +1256,8 @@ void QGIViewDimension::draw() if (parentItem()) { //TODO: parent redraw still required with new frame/label?? parentItem()->update(); + } else { + Base::Console().Log("INFO - QGIVD::draw - no parent to update\n"); } } diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp index fb04a74a03..b9058bfe37 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp @@ -76,8 +76,9 @@ std::vector ViewProviderAnnotation::getDisplayModes(void) const return StrList; } -void ViewProviderAnnotation::updateData(const App::Property*) +void ViewProviderAnnotation::updateData(const App::Property* prop) { + Gui::ViewProviderDocumentObject::updateData(prop); } TechDraw::DrawViewAnnotation* ViewProviderAnnotation::getViewObject() const diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index 9e89ae8186..756dc908e4 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -91,6 +91,7 @@ void ViewProviderDimension::updateData(const App::Property* p) sPixmap = "TechDraw_Dimension_Angle"; } } + Gui::ViewProviderDocumentObject::updateData(p); } TechDraw::DrawViewDimension* ViewProviderDimension::getViewObject() const diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp index 6560e6f7ea..8092a05653 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp @@ -76,8 +76,9 @@ std::vector ViewProviderHatch::getDisplayModes(void) const return StrList; } -void ViewProviderHatch::updateData(const App::Property*) +void ViewProviderHatch::updateData(const App::Property* prop) { + Gui::ViewProviderDocumentObject::updateData(prop); } TechDraw::DrawHatch* ViewProviderHatch::getViewObject() const diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp index 96e6e994c2..6898124c32 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp @@ -75,8 +75,9 @@ std::vector ViewProviderSpreadsheet::getDisplayModes(void) const return StrList; } -void ViewProviderSpreadsheet::updateData(const App::Property*) +void ViewProviderSpreadsheet::updateData(const App::Property* prop) { + Gui::ViewProviderDocumentObject::updateData(prop); } TechDraw::DrawViewSpreadsheet* ViewProviderSpreadsheet::getViewObject() const diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp index a1cbc5ec66..1448315907 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp @@ -76,8 +76,9 @@ std::vector ViewProviderSymbol::getDisplayModes(void) const return StrList; } -void ViewProviderSymbol::updateData(const App::Property*) +void ViewProviderSymbol::updateData(const App::Property* prop) { + Gui::ViewProviderDocumentObject::updateData(prop); } TechDraw::DrawViewSymbol* ViewProviderSymbol::getViewObject() const diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp index 473991ea16..c3bfd5f104 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp @@ -80,7 +80,8 @@ std::vector ViewProviderTemplate::getDisplayModes(void) const void ViewProviderTemplate::updateData(const App::Property* prop) { - //Base::Console().Log("ViewProviderTemplate::updateData(%s)/n",prop->getName()); + //Base::Console().Log("ViewProviderTemplate::updateData(%s)/n",prop->getName()); + Gui::ViewProviderDocumentObject::updateData(prop); } TechDraw::DrawTemplate* ViewProviderTemplate::getTemplate() const diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp index 53597b1914..c8d09429bd 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp @@ -83,6 +83,7 @@ void ViewProviderViewSection::updateData(const App::Property* prop) { //Base::Console().Log("ViewProviderViewSection::updateData - Update View: %s\n",prop->getName()); // + Gui::ViewProviderDocumentObject::updateData(prop); } std::vector ViewProviderViewSection::claimChildren(void) const