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

Merge pull request #4109 from donovaly/TD-dimensioning-fix

Browse Source 
[TD] treat dimensions the same way, no matter if with unit or not
This commit is contained in:
Yorik van Havre
2020-12-14 12:08:46 +01:00
committed by GitHub
parent 115963d79e 38734f4f86
commit cbcf45a4b9
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -691,21 +691,12 @@ std::string DrawViewDimension::formatValue(qreal value, QString qFormatSpec, int
// - the value in the base unit but without displayed unit // - the value in the base unit but without displayed unit
// - the value + unit (not necessarily the base unit!) // - the value + unit (not necessarily the base unit!)
// the user can overwrite the decimal settings, so we must in every case use the formatSpecifier // the user can overwrite the decimal settings, so we must in every case use the formatSpecifier
// if useDecimals(), then formatSpecifier = global decimals, otherwise it is %.2f // the default is: if useDecimals(), then formatSpecifier = global decimals, otherwise it is %.2f
QLocale loc; QLocale loc;
double userVal; double userVal;
bool checkDecimals = true;
if (showUnits() || (Type.isValue("Angle")) || (Type.isValue("Angle3Pt"))) { if (showUnits() || (Type.isValue("Angle")) || (Type.isValue("Angle3Pt"))) {
formattedValue = qUserString; // result value + unit (not necessarily base unit!) userVal = asQuantity.getValue();
// remove unit } else {
formattedValue.remove(rxUnits);
// to number
userVal = loc.toDouble(formattedValue);
if (userVal >= 1.0)
// we can assure we didn't make an error > 10% via getUserString()
checkDecimals = false;
}
if (checkDecimals){
// get value in the base unit with default decimals // get value in the base unit with default decimals
// for the conversion we use the same method as in DlgUnitsCalculator::valueChanged // for the conversion we use the same method as in DlgUnitsCalculator::valueChanged
// get the conversion factor for the unit // get the conversion factor for the unit
@@ -750,7 +741,6 @@ std::string DrawViewDimension::formatValue(qreal value, QString qFormatSpec, int
//qUserString from Quantity includes units - prefix + R + nnn ft + suffix //qUserString from Quantity includes units - prefix + R + nnn ft + suffix
qMultiValueStr = formatPrefix + qGenPrefix + qUserString + formatSuffix; qMultiValueStr = formatPrefix + qGenPrefix + qUserString + formatSuffix;
} }
formattedValue = qMultiValueStr; formattedValue = qMultiValueStr;
} }