From ff360d28f5a8f95a0a8186ca601f8eb38c1192bf Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Fri, 10 Jan 2020 22:51:28 +0100 Subject: diveplanner: add surface_segment to plannershared Add surface_segment to plannerShared and then update desktop-widgets. Signed-off-by: jan Iversen desktop-widgets: use plannerShared for surface_segment Change getter/setter for surface_segment to plannerShared, in order to share the conversion with mobile diveplanner Signed-off-by: jan Iversen --- desktop-widgets/diveplanner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index f236ec205..70aaa22e0 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -443,7 +443,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) ui.drop_stone_mode->setChecked(prefs.drop_stone_mode); ui.switch_at_req_stop->setChecked(prefs.switch_at_req_stop); ui.min_switch_duration->setValue(plannerShared::min_switch_duration()); - ui.surface_segment->setValue(prefs.surface_segment / 60); + ui.surface_segment->setValue(plannerShared::surface_segment()); ui.recreational_deco->setChecked(prefs.planner_deco_mode == RECREATIONAL); ui.buehlmann_deco->setChecked(prefs.planner_deco_mode == BUEHLMANN); ui.vpmb_deco->setChecked(prefs.planner_deco_mode == VPMB); @@ -481,7 +481,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) connect(ui.o2narcotic, &QAbstractButton::toggled, plannerShared::instance(), &plannerShared::set_o2narcotic); connect(ui.switch_at_req_stop, &QAbstractButton::toggled, plannerModel, &DivePlannerPointsModel::setSwitchAtReqStop); connect(ui.min_switch_duration, QOverload::of(&QSpinBox::valueChanged), plannerShared::instance(), &plannerShared::set_min_switch_duration); - connect(ui.surface_segment, QOverload::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setSurfaceSegment); + connect(ui.surface_segment, QOverload::of(&QSpinBox::valueChanged), plannerShared::instance(), plannerShared::set_surface_segment); connect(ui.rebreathermode, QOverload::of(&QComboBox::currentIndexChanged), plannerModel, &DivePlannerPointsModel::setRebreatherMode); connect(ui.rebreathermode, QOverload::of(&QComboBox::currentIndexChanged), this, &PlannerSettingsWidget::setBailoutVisibility); -- cgit v1.2.3-70-g09d2