From c4d9b737cdf0881a81c6ba635bd9dedbc3a1af26 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Mon, 23 Dec 2019 17:23:24 +0100 Subject: plannerShared: add o2narcotic Add include of cylinderModel Add o2narcotic the set function is special because it first informs the plannerModel that there is a new value and then ask cylindermodel to calculate a new bestmix Signed-off-by: Jan Iversen Signed-off-by: Dirk Hohndel --- backend-shared/plannershared.cpp | 12 ++++++++++++ backend-shared/plannershared.h | 4 ++++ 2 files changed, 16 insertions(+) (limited to 'backend-shared') diff --git a/backend-shared/plannershared.cpp b/backend-shared/plannershared.cpp index 2093e4c4f..fe4e52443 100644 --- a/backend-shared/plannershared.cpp +++ b/backend-shared/plannershared.cpp @@ -3,6 +3,7 @@ #include "core/settings/qPrefDivePlanner.h" #include "core/settings/qPrefTechnicalDetails.h" #include "qt-models/diveplannermodel.h" +#include "qt-models/cylindermodel.h" plannerShared *plannerShared::instance() { @@ -210,3 +211,14 @@ void plannerShared::set_sacfactor(double value) // NO conversion, this is done in the planner model. DivePlannerPointsModel::instance()->setSacFactor(value); } + +bool plannerShared::o2narcotic() +{ + return qPrefDivePlanner::o2narcotic(); +} +void plannerShared::set_o2narcotic(bool value) +{ + qPrefDivePlanner::set_o2narcotic(value); + DivePlannerPointsModel::instance()->emitDataChanged(); + CylindersModel::instance()->updateBestMixes(); +} diff --git a/backend-shared/plannershared.h b/backend-shared/plannershared.h index 366d801e3..7c446abc2 100644 --- a/backend-shared/plannershared.h +++ b/backend-shared/plannershared.h @@ -43,6 +43,7 @@ class plannerShared: public QObject { Q_PROPERTY(double decosac READ decosac WRITE set_decosac NOTIFY decosacChanged); Q_PROPERTY(int problemsolvingtime READ problemsolvingtime WRITE set_problemsolvingtime NOTIFY problemsolvingtimeChanged); Q_PROPERTY(double sacfactor READ sacfactor WRITE set_sacfactor NOTIFY sacfactorChanged); + Q_PROPERTY(bool o2narcotic READ o2narcotic WRITE set_o2narcotic NOTIFY o2narcoticChanged); public: static plannerShared *instance(); @@ -73,6 +74,7 @@ public: static double decosac(); static int problemsolvingtime(); static double sacfactor(); + static bool o2narcotic(); public slots: // Ascend/Descend data, converted to meter/feet depending on user selection @@ -101,6 +103,7 @@ public slots: static void set_decosac(double value); static void set_problemsolvingtime(int value); static void set_sacfactor(double value); + static void set_o2narcotic(bool value); signals: // Ascend/Descend data, converted to meter/feet depending on user selection @@ -129,6 +132,7 @@ signals: void decosacChanged(double value); void problemsolvingtimeChanged(int value); void sacfactorChanged(double value); + void o2narcoticChanged(bool value); private: plannerShared() {} -- cgit v1.2.3-70-g09d2