From 2d13b2d7cd270cde15dc2284fb8ec0275b2d3fc3 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Fri, 19 Apr 2019 10:55:42 -0400 Subject: [PATCH] Fix missing radius/dia on ft-in dimensions --- src/Mod/TechDraw/App/DrawViewDimension.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index aa71d8e723..1ac89f6155 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -466,10 +466,15 @@ std::string DrawViewDimension::getFormatedValue(bool obtuse) Base::UnitSystem uniSys = Base::UnitsApi::getSchema(); //handle multi value schemes + std::string pre = getPrefix(); + QString qPre = QString::fromUtf8(pre.data(),pre.size()); if (((uniSys == Base::UnitSystem::Imperial1) || (uniSys == Base::UnitSystem::ImperialBuilding) ) && !angularMeasure) { specStr = userStr; + if (!pre.empty()) { + specStr = qPre + userStr; + } } else if ((uniSys == Base::UnitSystem::ImperialCivil) && angularMeasure) { QString dispMinute = QString::fromUtf8("\'"); @@ -478,6 +483,9 @@ std::string DrawViewDimension::getFormatedValue(bool obtuse) QString schemeSecond = QString::fromUtf8("S"); specStr = userStr.replace(schemeMinute,dispMinute); specStr = specStr.replace(schemeSecond,dispSecond); + if (!pre.empty()) { + specStr = qPre + userStr; + } } else { //handle single value schemes QRegExp rxUnits(QString::fromUtf8(" \\D*$")); //space + any non digits at end of string