From 040b804c1c451963531db6d0da31e61b853747ae Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Thu, 15 Dec 2016 23:02:32 +0100 Subject: [PATCH 1/2] Set surface pressure and salinity correctly when replanning To: subsurface@subsurface-divelog.org We need to initialize the UI elements accordingly. Fixes #1094 Signed-off-by: Robert C. Helling --- desktop-widgets/diveplanner.cpp | 10 ++++++++++ desktop-widgets/diveplanner.h | 2 ++ desktop-widgets/mainwindow.cpp | 2 ++ 3 files changed, 14 insertions(+) diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index b12feab..ee85d12 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -181,6 +181,16 @@ void DivePlannerWidget::setupStartTime(QDateTime startTime) ui.dateEdit->setDate(startTime.date()); } +void DivePlannerWidget::setSurfacePressure(int surface_pressure) +{ + ui.ATMPressure->setValue(surface_pressure); +} + +void DivePlannerWidget::setSalinity(int salinity) +{ + ui.salinity->setValue(salinity / 10000.0); +} + void DivePlannerWidget::settingsChanged() { // Adopt units diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h index cf3a172..91501ce 100644 --- a/desktop-widgets/diveplanner.h +++ b/desktop-widgets/diveplanner.h @@ -52,6 +52,8 @@ slots: void heightChanged(const int height); void salinityChanged(const double salinity); void printDecoPlan(); + void setSurfacePressure(int surface_pressure); + void setSalinity(int salinity); private: Ui::DivePlanner ui; diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 2143663..5231961 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -914,6 +914,8 @@ void MainWindow::on_actionReplanDive_triggered() setApplicationState("PlanDive"); divePlannerWidget()->setReplanButton(true); divePlannerWidget()->setupStartTime(QDateTime::fromMSecsSinceEpoch(1000 * current_dive->when, Qt::UTC)); + divePlannerWidget()->setSurfacePressure(current_dive->surface_pressure.mbar); + divePlannerWidget()->setSalinity(current_dive->salinity); DivePlannerPointsModel::instance()->loadFromDive(current_dive); reset_cylinders(&displayed_dive, true); } -- 2.10.1 (Apple Git-78)