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

Display correct symbols for Minute/Second

Browse Source 
- the ImperialCivil unit schema uses "M" for angular
  minutes and "S" for angular seconds. These must be
  replaced by ' and ".
This commit is contained in:
wandererfan
2018-12-05 15:41:25 -05:00
committed by Yorik van Havre
parent fefe83ecbb
commit d10e06039d
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,14 +439,6 @@ std::string DrawViewDimension::getFormatedValue(bool obtuse)
return FormatSpec.getStrValue();
}
//units api: get schema to figure out if this is multi-value schema(Imperial1, ImperialBuilding)
//if it is multi-unit schema, don't even try to use Alt Decimals or format per format spec
bool multiValueUnits = false;
Base::UnitSystem uniSys = Base::UnitsApi::getSchema();
if ( (uniSys == Base::UnitSystem::Imperial1) ||
(uniSys == Base::UnitSystem::ImperialBuilding) ) {
multiValueUnits = true;
}
QString specStr = QString::fromUtf8(FormatSpec.getStrValue().data(),FormatSpec.getStrValue().size());
double val = std::abs(getDimValue()); //internal units!
@@ -470,11 +462,25 @@ std::string DrawViewDimension::getFormatedValue(bool obtuse)
// really should be able to ask units for value
// in appropriate UoM!!
if (multiValueUnits &&
!angularMeasure) {
//units api: get schema to figure out if this is multi-value schema(Imperial1, ImperialBuilding, etc)
//if it is multi-unit schema, don't even try to use Alt Decimals or format per format spec
Base::UnitSystem uniSys = Base::UnitsApi::getSchema();
//handle multi value schemes
if (((uniSys == Base::UnitSystem::Imperial1) ||
(uniSys == Base::UnitSystem::ImperialBuilding) ) &&
!angularMeasure) {
specStr = userStr;
} else if ((uniSys == Base::UnitSystem::ImperialCivil) &&
angularMeasure) {
QString dispMinute = QString::fromUtf8("\'");
QString dispSecond = QString::fromUtf8("\"");
QString schemeMinute = QString::fromUtf8("M");
QString schemeSecond = QString::fromUtf8("S");
specStr = userStr.replace(schemeMinute,dispMinute);
specStr = specStr.replace(schemeSecond,dispSecond);
} else {
//should be able to handle angular Measures even in ft-in systems
//handle single value schemes
QRegExp rxUnits(QString::fromUtf8(" \\D*$")); //space + any non digits at end of string
QString userVal = userStr;