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

FIX: Prevent situation where default format entered in preferences, overwrites prefixes on eg. circular dimensions

Browse Source
This commit is contained in:
babaroga
2019-04-16 19:37:28 +02:00
committed by WandererFan
parent 02f192726e
commit c779f34fee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -981,6 +981,7 @@ std::string DrawViewDimension::getDefaultFormatSpec() const
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions");
std::string prefFormat = hGrp->GetASCII("formatSpec","");
QString formatSpec;
QString qPrefix;
if (prefFormat.empty()) {
QString format1 = Base::Tools::fromStdString("%.");
QString format2 = Base::Tools::fromStdString("f");
@@ -993,14 +994,18 @@ std::string DrawViewDimension::getDefaultFormatSpec() const
QString formatPrecision = QString::number(precision);
std::string prefix = getPrefix();
QString qPrefix;
if (!prefix.empty()) {
qPrefix = QString::fromUtf8(prefix.data(),prefix.size());
}
formatSpec = qPrefix + format1 + formatPrecision + format2;
} else {
return prefFormat;
std::string prefix = getPrefix();
qPrefix = QString::fromUtf8(prefix.data(),prefix.size());
formatSpec = qPrefix + QString::fromStdString(prefFormat);
}
return Base::Tools::toStdString(formatSpec);