From a1de871e93551972d0ffd05ebc9fb48d50ec4510 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Thu, 17 Oct 2019 16:12:48 -0400 Subject: [PATCH] [TD]Fix duplicate Arbitrary dim text --- src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index 2c0df20fe9..969250b500 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -538,21 +538,26 @@ void QGIViewDimension::updateDim() if ( vp == nullptr ) { return; } - + // QString labelText = QString::fromUtf8(dim->getFormatedValue().c_str()); //want this split into value and unit QString labelText = QString::fromUtf8(dim->getFormatedValue(1).c_str()); //just the number QString unitText = QString::fromUtf8(dim->getFormatedValue(2).c_str()); //just the unit - + QString arbText = QString::fromUtf8(dim->FormatSpec.getValue()); + QFont font = datumLabel->getFont(); font.setFamily(QString::fromUtf8(vp->Font.getValue())); font.setPixelSize(calculateFontPixelSize(vp->Fontsize.getValue())); datumLabel->setFont(font); prepareGeometryChange(); - datumLabel->setDimString(labelText); - datumLabel->setTolString(); - datumLabel->setUnitString(unitText); + if (dim->Arbitrary.getValue()) { + datumLabel->setDimString(arbText); + } else { + datumLabel->setDimString(labelText); + datumLabel->setTolString(); + datumLabel->setUnitString(unitText); + } datumLabel->setPosFromCenter(datumLabel->X(),datumLabel->Y()); datumLabel->setFramed(dim->TheoreticalExact.getValue());