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

[TD]Treat Imperial1/USCustomary as single value schema

Browse Source
This commit is contained in:
wandererfan
2020-06-11 10:30:46 -04:00
committed by WandererFan
parent 6632921e38
commit c19fae2cbb
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,10 +519,8 @@ bool DrawViewDimension::isMultiValueSchema(void) const
}
Base::UnitSystem uniSys = Base::UnitsApi::getSchema();
if (((uniSys == Base::UnitSystem::Imperial1) ||
(uniSys == Base::UnitSystem::ImperialBuilding) ) &&
!angularMeasure) {
if ( (uniSys == Base::UnitSystem::ImperialBuilding) &&
!angularMeasure ) {
result = true;
} else if ((uniSys == Base::UnitSystem::ImperialCivil) &&
angularMeasure) {
@@ -576,9 +574,8 @@ std::string DrawViewDimension::getFormatedValue(int partial)
std::string genPrefix = getPrefix(); //general prefix - diameter, radius, etc
QString qMultiValueStr;
QString qGenPrefix = QString::fromUtf8(genPrefix.data(),genPrefix.size());
if (((unitSystem == Base::UnitSystem::Imperial1) ||
(unitSystem == Base::UnitSystem::ImperialBuilding) ) &&
!angularMeasure) {
if ( (unitSystem == Base::UnitSystem::ImperialBuilding) &&
!angularMeasure ) {
multiValueSchema = true;
qMultiValueStr = qUserString;
if (!genPrefix.empty()) {