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

[skip ci] use QLocale class consistently to make it possible to change it application-wide

Browse Source
This commit is contained in:
wmayer
2020-03-26 16:37:45 +01:00
parent caee1eb48d
commit ec8b1bc072
16 changed files with 97 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Spreadsheet/App/Cell.cpp
View File

@@ -983,11 +983,11 @@ std::string Cell::getFormattedQuantity(void)
bool hasDisplayUnit = getDisplayUnit(du);
double duScale = du.scaler;
const Base::Unit& computedUnit = floatProp->getUnit();
qFormatted = QLocale::system().toString(rawVal,'f',Base::UnitsApi::getDecimals());
qFormatted = QLocale().toString(rawVal,'f',Base::UnitsApi::getDecimals());
if (hasDisplayUnit) {
if (computedUnit.isEmpty() || computedUnit == du.unit) {
QString number =
QLocale::system().toString(rawVal / duScale,'f',Base::UnitsApi::getDecimals());
QLocale().toString(rawVal / duScale,'f',Base::UnitsApi::getDecimals());
qFormatted = number + Base::Tools::fromStdString(" " + displayUnit.stringRep);
}
}
@@ -997,9 +997,9 @@ std::string Cell::getFormattedQuantity(void)
DisplayUnit du;
bool hasDisplayUnit = getDisplayUnit(du);
double duScale = du.scaler;
qFormatted = QLocale::system().toString(rawVal,'f',Base::UnitsApi::getDecimals());
qFormatted = QLocale().toString(rawVal,'f',Base::UnitsApi::getDecimals());
if (hasDisplayUnit) {
QString number = QLocale::system().toString(rawVal / duScale, 'f',Base::UnitsApi::getDecimals());
QString number = QLocale().toString(rawVal / duScale, 'f',Base::UnitsApi::getDecimals());
qFormatted = number + Base::Tools::fromStdString(" " + displayUnit.stringRep);
}
} else if (prop->isDerivedFrom(App::PropertyInteger::getClassTypeId())) {
@@ -1008,9 +1008,9 @@ std::string Cell::getFormattedQuantity(void)
bool hasDisplayUnit = getDisplayUnit(du);
double duScale = du.scaler;
int iRawVal = std::round(rawVal);
qFormatted = QLocale::system().toString(iRawVal);
qFormatted = QLocale().toString(iRawVal);
if (hasDisplayUnit) {
QString number = QLocale::system().toString(rawVal / duScale, 'f',Base::UnitsApi::getDecimals());
QString number = QLocale().toString(rawVal / duScale, 'f',Base::UnitsApi::getDecimals());
qFormatted = number + Base::Tools::fromStdString(" " + displayUnit.stringRep);
}
}

8
src/Mod/Spreadsheet/Gui/SheetModel.cpp
View File

@@ -361,7 +361,7 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
// Display locale specific decimal separator (#0003875,#0003876)
if (cell->getDisplayUnit(displayUnit)) {
if (computedUnit.isEmpty() || computedUnit == displayUnit.unit) {
QString number = QLocale::system().toString(floatProp->getValue() / displayUnit.scaler,'f',Base::UnitsApi::getDecimals());
QString number = QLocale().toString(floatProp->getValue() / displayUnit.scaler,'f',Base::UnitsApi::getDecimals());
//QString number = QString::number(floatProp->getValue() / displayUnit.scaler);
v = number + Base::Tools::fromStdString(" " + displayUnit.stringRep);
}
@@ -370,7 +370,7 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
}
}
else {
QString number = QLocale::system().toString(floatProp->getValue(),'f',Base::UnitsApi::getDecimals());
QString number = QLocale().toString(floatProp->getValue(),'f',Base::UnitsApi::getDecimals());
//QString number = QString::number(floatProp->getValue());
if (!computedUnit.isEmpty())
v = number + Base::Tools::fromStdString(" " + getUnitString(computedUnit));
@@ -424,12 +424,12 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
// Display locale specific decimal separator (#0003875,#0003876)
if (cell->getDisplayUnit(displayUnit)) {
QString number = QLocale::system().toString(d / displayUnit.scaler,'f',Base::UnitsApi::getDecimals());
QString number = QLocale().toString(d / displayUnit.scaler,'f',Base::UnitsApi::getDecimals());
//QString number = QString::number(d / displayUnit.scaler);
v = number + Base::Tools::fromStdString(" " + displayUnit.stringRep);
}
else {
v = QLocale::system().toString(d,'f',Base::UnitsApi::getDecimals());
v = QLocale().toString(d,'f',Base::UnitsApi::getDecimals());
//v = QString::number(d);
}
return QVariant(v);