kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix missing radius/dia on ft-in dimensions

Browse Source
This commit is contained in:
wandererfan
2019-04-19 10:55:42 -04:00
committed by WandererFan
parent c3dc748701
commit 06962535fa
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/TechDraw/App/DrawViewDimension.cpp
View File

@@ -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