From ecf0408aae4024f70a3c9689d1de394a2f47a0ff Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Wed, 6 Aug 2014 10:16:12 +0200 Subject: [PATCH] Make SAC values in planner settings respect unit settings So far, the fields for the two SAC rates did not show a unit and were implictly l/min. Now they respect the settings for volume units. This was harder than I thought for two reasons: 1) Imperial units for SAC are cuft/min but a typical value would be .70. So I made the point the field prefix and what is entered is actually hundreth of cuft per minute. 2) I had to get the rounding right in order not to get effects like 20l/min become .70 cuft/min (19800 ml/min internally) which would then become 19l/min when switching back. While being at it, I gave the gradient factors '%'-signs as units. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- dive.c | 11 +++++++++++ dive.h | 1 + qt-ui/diveplanner.cpp | 26 ++++++++++++++++++++++---- qt-ui/plannerSettings.ui | 22 ++++++++++++++++++---- 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dive.c b/dive.c index 4f42e48d6..4e81f8a70 100644 --- a/dive.c +++ b/dive.c @@ -188,6 +188,17 @@ double get_volume_units(unsigned int ml, int *frac, const char **units) return vol; } +int units_to_sac(int volume) +{ + if(get_units()->volume == CUFT) + if (volume < 10) + return cuft_to_l(volume) * 100; + else + return cuft_to_l(volume) * 10; + else + return volume * 1000; +} + unsigned int units_to_depth(double depth) { if (get_units()->length == METERS) diff --git a/dive.h b/dive.h index 7cd67fa27..144726135 100644 --- a/dive.h +++ b/dive.h @@ -99,6 +99,7 @@ extern double get_weight_units(unsigned int grams, int *frac, const char **units extern double get_vertical_speed_units(unsigned int mms, int *frac, const char **units); extern unsigned int units_to_depth(double depth); +extern int units_to_sac(int volume); /* Volume in mliter of a cylinder at pressure 'p' */ extern int gas_volume(cylinder_t *cyl, pressure_t p); diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 09320cafe..e51400ac0 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -416,8 +416,8 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) connect(ui.gflow, SIGNAL(editingFinished()), plannerModel, SLOT(triggerGFLow())); connect(ui.backgasBreaks, SIGNAL(toggled(bool)), this, SLOT(setBackgasBreaks(bool))); - ui.bottomSAC->setValue(prefs.bottomsac / 1000.0); - ui.decoStopSAC->setValue(prefs.decosac / 1000.0); + ui.bottomSAC->setValue(rint(get_volume_units(prefs.bottomsac, NULL, NULL))); + ui.decoStopSAC->setValue(rint(get_volume_units(prefs.decosac, NULL, NULL))); ui.gflow->setValue(prefs.gflow); ui.gfhigh->setValue(prefs.gfhigh); @@ -466,6 +466,21 @@ void PlannerSettingsWidget::settingsChanged() ui.asc50to6->setText(tr("50% avg. depth to 6m")); ui.asc6toSurf->setText(tr("6m to surface")); } + if(get_units()->volume == units::CUFT) { + ui.bottomSAC->setSuffix(tr("cuft/min")); + ui.decoStopSAC->setSuffix(tr("cuft/min")); + ui.bottomSAC->setPrefix("."); + ui.decoStopSAC->setPrefix("."); + ui.bottomSAC->setValue(rint(ml_to_cuft(prefs.bottomsac) * 100.0)); + ui.decoStopSAC->setValue(rint(ml_to_cuft(prefs.decosac) * 100.0)); + } else { + ui.bottomSAC->setSuffix(tr("ℓ/min")); + ui.decoStopSAC->setSuffix(tr("ℓ/min")); + ui.bottomSAC->setPrefix(""); + ui.decoStopSAC->setPrefix(""); + ui.bottomSAC->setValue(rint((double) prefs.bottomsac / 1000.0)); + ui.decoStopSAC->setValue(rint((double) prefs.decosac / 1000.0)); + } updateUnitsUI(); ui.ascRate75->setSuffix(vs); ui.ascRate50->setSuffix(vs); @@ -690,14 +705,17 @@ void DivePlannerPointsModel::emitDataChanged() void DivePlannerPointsModel::setBottomSac(int sac) { - diveplan.bottomsac = sac * 1000; + volume_t newSAC; + newSAC.mliter = units_to_sac(sac); + diveplan.bottomsac = newSAC.mliter; prefs.bottomsac = diveplan.bottomsac; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } void DivePlannerPointsModel::setDecoSac(int sac) { - diveplan.decosac = sac * 1000; + volume_t newSAC; + diveplan.decosac = units_to_sac(sac); prefs.decosac = diveplan.decosac; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index 0ad0f5b70..a28453c01 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -30,8 +30,8 @@ 0 0 - 1089 - 404 + 1078 + 418 @@ -271,6 +271,9 @@ + + % + 1 @@ -288,6 +291,9 @@ + + % + 1 @@ -362,7 +368,11 @@ - + + + ℓ/min + + @@ -372,7 +382,11 @@ - + + + ℓ/min + +