diff options
| -rw-r--r-- | desktop-widgets/diveplanner.cpp | 5 | ||||
| -rw-r--r-- | desktop-widgets/diveplanner.h | 1 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index 9dce53da8..3b4a5484b 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -186,6 +186,11 @@ void DivePlannerWidget::setSurfacePressure(int surface_pressure) ui.ATMPressure->setValue(surface_pressure); } +void PlannerSettingsWidget::setDiveMode(int mode) +{ + ui.rebreathermode->setCurrentIndex(mode); +} + void DivePlannerWidget::setSalinity(int salinity) { ui.salinity->setValue(salinity / 10000.0); diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h index f0cae3e5b..0c8d29b42 100644 --- a/desktop-widgets/diveplanner.h +++ b/desktop-widgets/diveplanner.h @@ -85,6 +85,7 @@ slots: void setBestmixEND(int depth); void setBackgasBreaks(bool dobreaks); void disableDecoElements(int mode); + void setDiveMode(int mode); private: Ui::plannerSettingsWidget ui; diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 259db6a33..0ce5ef648 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -908,6 +908,7 @@ void MainWindow::setupForAddAndPlan(const char *model) // setup the dive cylinders DivePlannerPointsModel::instance()->clear(); DivePlannerPointsModel::instance()->setupCylinders(); + } void MainWindow::on_actionReplanDive_triggered() @@ -951,6 +952,8 @@ void MainWindow::on_actionDivePlanner_triggered() setupForAddAndPlan("planned dive"); // don't translate, stored in XML file DivePlannerPointsModel::instance()->setupStartTime(); DivePlannerPointsModel::instance()->createSimpleDive(); + // plan the dive in the same mode as the currently selected one + divePlannerSettingsWidget()->setDiveMode(current_dive->dc.divemode); DivePictureModel::instance()->updateDivePictures(); divePlannerWidget()->setReplanButton(false); } |