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

Base: minor refactoring of UnitsSchema::toLocale

Browse Source
This commit is contained in:
Ladislav Michl
2025-05-20 11:24:20 +02:00
parent 16d736fb96
commit 4a9eccf530
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Base/UnitsSchema.cpp
View File

@@ -94,20 +94,17 @@ UnitsSchema::toLocale(const Quantity& quant, const double factor, const std::str
QLocale Lc;
const QuantityFormat& format = quant.getFormat();
if (format.option != QuantityFormat::None) {
int opt = format.option;
Lc.setNumberOptions(static_cast<QLocale::NumberOptions>(opt));
Lc.setNumberOptions(static_cast<QLocale::NumberOptions>(format.option));
}
std::string valueString =
Lc.toString((quant.getValue() / factor), format.toFormat(), format.precision).toStdString();
auto valueString =
Lc.toString(quant.getValue() / factor, format.toFormat(), format.precision).toStdString();
return fmt::format("{}{}{}",
valueString,
unitString.empty() || unitString == "°" || unitString == "″"
|| unitString == "′" || unitString == "\"" || unitString == "'"
? ""
: " ",
unitString);
auto notUnit = [](auto s) {
return s.empty() || s == "°" || s == "″" || s == "′" || s == "\"" || s == "'";
};
return fmt::format("{}{}{}", valueString, notUnit(unitString) ? "" : " ", unitString);
}
bool UnitsSchema::isMultiUnitLength() const