mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: add CRTP base class to unit types
The goal here is to add general addition and scalar multiplication functions to the unit types. Thereto, we need a CRTP (https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern) base class. However, this breaks compound initialization, so we have to use named initializers: weight_t { 2000 } -> weight_t { .grams = 2000 } The good thing is that this is exactly how these classes were supposed to be used: make the unit explicit! Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
696ba61eef
commit
12ca172a9e
26 changed files with 127 additions and 138 deletions
|
|
@ -786,33 +786,6 @@ int parseTemperatureToMkelvin(const QString &text)
|
|||
return mkelvin;
|
||||
}
|
||||
|
||||
int parseWeightToGrams(const QString &text)
|
||||
{
|
||||
int grams;
|
||||
QString numOnly = text;
|
||||
numOnly.replace(",", ".").remove(QRegularExpression("[^0-9.]"));
|
||||
if (numOnly.isEmpty())
|
||||
return 0;
|
||||
double number = numOnly.toDouble();
|
||||
if (text.contains(gettextFromC::tr("kg"), Qt::CaseInsensitive)) {
|
||||
grams = lrint(number * 1000);
|
||||
} else if (text.contains(gettextFromC::tr("lbs"), Qt::CaseInsensitive)) {
|
||||
grams = lbs_to_grams(number);
|
||||
} else {
|
||||
switch (prefs.units.weight) {
|
||||
case units::KG:
|
||||
grams = lrint(number * 1000);
|
||||
break;
|
||||
case units::LBS:
|
||||
grams = lbs_to_grams(number);
|
||||
break;
|
||||
default:
|
||||
grams = 0;
|
||||
}
|
||||
}
|
||||
return grams;
|
||||
}
|
||||
|
||||
int parsePressureToMbar(const QString &text)
|
||||
{
|
||||
int mbar;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue