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

Planner: correctly deal with units in Ascent/descent rates

Browse source 
This adds two changes
a) it uses rint() to make sure we don't truncate the displayed values
b) it moves the update of the displayed values into a helper function that
   is also called whenever the settings change

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-17 08:03:52 -07:00
parent 13b8680b0c
commit 24472a3b23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qt-ui/diveplanner.cpp
View file

@ -321,7 +321,6 @@ void DivePlannerWidget::settingsChanged()
} else {
ui.atmHeight->setSuffix(("m"));
}
}
void DivePlannerPointsModel::addCylinder_clicked()
@ -380,11 +379,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
prefs.decosac = s.value("decosac", 17000).toInt();
s.endGroup();
ui.ascRate75->setValue(prefs.ascrate75 / UNIT_FACTOR);
ui.ascRate50->setValue(prefs.ascrate50 / UNIT_FACTOR);
ui.ascRateStops->setValue(prefs.ascratestops / UNIT_FACTOR);
ui.ascRateLast6m->setValue(prefs.ascratelast6m / UNIT_FACTOR);
ui.descRate->setValue(prefs.descrate / UNIT_FACTOR);
updateUnitsUI();
ui.bottompo2->setValue(prefs.bottompo2 / 1000.0);
ui.decopo2->setValue(prefs.decopo2 / 1000.0);
ui.backgasBreaks->setChecked(prefs.doo2breaks);
@ -423,6 +418,15 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
setMinimumHeight(0);
}
void PlannerSettingsWidget::updateUnitsUI()
{
ui.ascRate75->setValue(rint(prefs.ascrate75 / UNIT_FACTOR));
ui.ascRate50->setValue(rint(prefs.ascrate50 / UNIT_FACTOR));
ui.ascRateStops->setValue(rint(prefs.ascratestops / UNIT_FACTOR));
ui.ascRateLast6m->setValue(rint(prefs.ascratelast6m / UNIT_FACTOR));
ui.descRate->setValue(rint(prefs.descrate / UNIT_FACTOR));
}
PlannerSettingsWidget::~PlannerSettingsWidget()
{
QSettings s;
@ -451,6 +455,7 @@ void PlannerSettingsWidget::settingsChanged()
vs.append(tr("m/min"));
ui.lastStop->setText(tr("Last stop at 6m"));
}
updateUnitsUI();
ui.ascRate75->setSuffix(vs);
ui.ascRate50->setSuffix(vs);
ui.ascRateStops->setSuffix(vs);

1
qt-ui/diveplanner.h
View file

@ -169,6 +169,7 @@ slots:
private:
Ui::plannerSettingsWidget ui;
void updateUnitsUI();
};
QString dpGasToStr(const divedatapoint &p);