diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2016-02-12 21:12:23 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-02-13 10:03:50 -0800 |
| commit | 6252d0cd3bda32256d284aec09230c9bf1f8291b (patch) | |
| tree | d2cb8528c90fbf721bb2cd8d4f656f25721ef278 /qt-mobile | |
| parent | a91d4164b4e64fcf02dc32c1e3379b3cc15af307 (diff) | |
| download | subsurface-6252d0cd3bda32256d284aec09230c9bf1f8291b.tar.gz | |
While parsing weight and pressure we should not change the users settings.
Now it is possible to enter a specific unit that is different from the
unit stored in the preferences. If only numbers are inputed the unit will
be the same as specified by the users preferences.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile')
| -rw-r--r-- | qt-mobile/qmlmanager.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp index a772e0926..cd45d304a 100644 --- a/qt-mobile/qmlmanager.cpp +++ b/qt-mobile/qmlmanager.cpp @@ -505,20 +505,12 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location if (weightsystem_none((void *)&d->weightsystem[1])) { if (get_weight_string(d->weightsystem[0].weight, true) != weight) { diveChanged = true; - if (weight.contains(tr("kg"))) - prefs.units.weight = units::KG; - else if (weight.contains(tr("lbs"))) - prefs.units.weight = units::LBS; d->weightsystem[0].weight.grams = parseWeightToGrams(weight); } } // start and end pressures for first cylinder only if (get_pressure_string(d->cylinder[0].start, true) != startpressure || get_pressure_string(d->cylinder[0].end, true) != endpressure) { diveChanged = true; - if (startpressure.contains(tr("bar")) || endpressure.contains(tr("bar"))) - prefs.units.pressure = units::BAR; - else if (startpressure.contains(tr("psi")) || endpressure.contains(tr("psi"))) - prefs.units.pressure = units::PSI; d->cylinder[0].start.mbar = parsePressureToMbar(startpressure); d->cylinder[0].end.mbar = parsePressureToMbar(endpressure); } |