mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up conversion helpers

Browse source 
- coding style (ugh - I should have fixed that when I first committed them)
- remove redundant variables
- add similar code to the length and temperature helpers

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-02-15 07:48:57 -08:00
parent bbbd479914
commit 75bd37e3e5
1 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

70
subsurface-core/qthelper.cpp
View file

@ -794,15 +794,21 @@ int parseLengthToMm(const QString &text)
if (numOnly.isEmpty()) if (numOnly.isEmpty())
return 0; return 0;
double number = numOnly.toDouble(); double number = numOnly.toDouble();
switch (prefs.units.length) { if (text.contains(QObject::tr("m"))) {
case units::FEET:
mm = feet_to_mm(number);
break;
case units::METERS:
mm = number * 1000; mm = number * 1000;
break; } else if (text.contains(QObject::tr("ft"))) {
default: mm = feet_to_mm(number);
mm = 0; } else {
switch (prefs.units.length) {
case units::FEET:
mm = feet_to_mm(number);
break;
case units::METERS:
mm = number * 1000;
break;
default:
mm = 0;
}
} }
return mm; return mm;
@ -816,15 +822,21 @@ int parseTemperatureToMkelvin(const QString &text)
if (numOnly.isEmpty()) if (numOnly.isEmpty())
return 0; return 0;
double number = numOnly.toDouble(); double number = numOnly.toDouble();
switch (prefs.units.temperature) { if (text.contains(QObject::tr("C"))) {
case units::CELSIUS:
mkelvin = C_to_mkelvin(number); mkelvin = C_to_mkelvin(number);
break; } else if (text.contains(QObject::tr("F"))) {
case units::FAHRENHEIT:
mkelvin = F_to_mkelvin(number); mkelvin = F_to_mkelvin(number);
break; } else {
default: switch (prefs.units.temperature) {
mkelvin = 0; case units::CELSIUS:
mkelvin = C_to_mkelvin(number);
break;
case units::FAHRENHEIT:
mkelvin = F_to_mkelvin(number);
break;
default:
mkelvin = 0;
}
} }
return mkelvin; return mkelvin;
} }
@ -832,17 +844,16 @@ int parseTemperatureToMkelvin(const QString &text)
int parseWeightToGrams(const QString &text) int parseWeightToGrams(const QString &text)
{ {
int grams; int grams;
QString kg_or_lbs = text;
QString numOnly = text; QString numOnly = text;
numOnly.replace(",", ".").remove(QRegExp("[^0-9.]")); numOnly.replace(",", ".").remove(QRegExp("[^0-9.]"));
if (numOnly.isEmpty()) if (numOnly.isEmpty())
return 0; return 0;
double number = numOnly.toDouble(); double number = numOnly.toDouble();
if (kg_or_lbs.contains(QObject::tr("kg"))) if (text.contains(QObject::tr("kg"))) {
grams = rint(number * 1000); grams = rint(number * 1000);
else if (kg_or_lbs.contains(QObject::tr("lbs"))) } else if (text.contains(QObject::tr("lbs"))) {
grams = lbs_to_grams(number); grams = lbs_to_grams(number);
else { } else {
switch (prefs.units.weight) { switch (prefs.units.weight) {
case units::KG: case units::KG:
grams = rint(number * 1000); grams = rint(number * 1000);
@ -860,17 +871,16 @@ int parseWeightToGrams(const QString &text)
int parsePressureToMbar(const QString &text) int parsePressureToMbar(const QString &text)
{ {
int mbar; int mbar;
QString psi_or_bar = text;
QString numOnly = text; QString numOnly = text;
numOnly.replace(",", ".").remove(QRegExp("[^0-9.]")); numOnly.replace(",", ".").remove(QRegExp("[^0-9.]"));
if (numOnly.isEmpty()) if (numOnly.isEmpty())
return 0; return 0;
double number = numOnly.toDouble(); double number = numOnly.toDouble();
if (psi_or_bar.contains(QObject::tr("bar"))) if (text.contains(QObject::tr("bar"))) {
mbar = rint(number * 1000); mbar = rint(number * 1000);
else if (psi_or_bar.contains(QObject::tr("psi"))) } else if (text.contains(QObject::tr("psi"))) {
mbar = psi_to_mbar(number); mbar = psi_to_mbar(number);
else { } else {
switch (prefs.units.pressure) { switch (prefs.units.pressure) {
case units::BAR: case units::BAR:
mbar = rint(number * 1000); mbar = rint(number * 1000);
@ -891,22 +901,18 @@ int parseGasMixO2(const QString &text)
int o2, number; int o2, number;
if (gasString.contains(QObject::tr("AIR"), Qt::CaseInsensitive)) { if (gasString.contains(QObject::tr("AIR"), Qt::CaseInsensitive)) {
o2 = O2_IN_AIR; o2 = O2_IN_AIR;
} } else if (gasString.contains(QObject::tr("EAN"), Qt::CaseInsensitive)) {
else if (gasString.contains(QObject::tr("EAN"), Qt::CaseInsensitive)) {
gasString.remove(QRegExp("[^0-9]")); gasString.remove(QRegExp("[^0-9]"));
number = gasString.toInt(); number = gasString.toInt();
o2 = number * 10; o2 = number * 10;
} } else if (gasString.contains("/")) {
else if (gasString.contains("/")) {
QStringList gasSplit = gasString.split("/"); QStringList gasSplit = gasString.split("/");
number = gasSplit[0].toInt(); number = gasSplit[0].toInt();
o2 = number * 10; o2 = number * 10;
} } else {
else {
number = gasString.toInt(); number = gasString.toInt();
o2 = number * 10; o2 = number * 10;
} }
return o2; return o2;
} }
@ -918,11 +924,9 @@ int parseGasMixHE(const QString &text)
QStringList gasSplit = gasString.split("/"); QStringList gasSplit = gasString.split("/");
number = gasSplit[1].toInt(); number = gasSplit[1].toInt();
he = number * 10; he = number * 10;
} } else {
else {
he = 0; he = 0;
} }
return he; return he;
} }