diff options
author | jan Iversen <jan@casacondor.com> | 2019-12-14 23:12:26 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-12-24 08:44:23 +0900 |
commit | 7751ec1c78642ffcc470ad8714a87851fd5b069d (patch) | |
tree | 9846edde60477f36d95839c4f7383de380e3f497 /core | |
parent | 9c52aaf043753dbb594c7420f776c836215dd6d2 (diff) | |
download | subsurface-7751ec1c78642ffcc470ad8714a87851fd5b069d.tar.gz |
build-system: move plannerShared to backend-shared
WARNING: multi directory commit, needed to secure it builds.
move the core/plannerShared.* to backend-shared.
update CMakeLists.txt to include backend-shared lib in link process.
update ios project to reflect new directory
Signed-off-by: Jan Iversen <jan@casacondor.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/CMakeLists.txt | 2 | ||||
-rw-r--r-- | core/plannershared.cpp | 61 | ||||
-rw-r--r-- | core/plannershared.h | 55 |
3 files changed, 0 insertions, 118 deletions
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 017fbdeea..c8c457432 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -72,8 +72,6 @@ set(SUBSURFACE_CORE_LIB_SRCS divelist.h divelogexportlogic.cpp divelogexportlogic.h - plannershared.cpp - plannershared.h divesite-helper.cpp divesite.c divesite.h diff --git a/core/plannershared.cpp b/core/plannershared.cpp deleted file mode 100644 index ff95b9e0e..000000000 --- a/core/plannershared.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "plannershared.h" -#include "core/pref.h" -#include "core/settings/qPrefDivePlanner.h" - - -plannerShared *plannerShared::instance() -{ - static plannerShared *self = new plannerShared; - return self; -} - -// Used to convert between meter/feet and keep the qPref variables independent -#define TO_MM_BY_SEC ((prefs.units.length == units::METERS) ? 1000.0 / 60.0 : feet_to_mm(1.0) / 60.0) - -// Converted meter/feet qPrefDivePlanner values -int plannerShared::ascratelast6m() -{ - return lrint(prefs.ascratelast6m / TO_MM_BY_SEC); -} -void plannerShared::set_ascratelast6m(int value) -{ - qPrefDivePlanner::set_ascratelast6m(value * TO_MM_BY_SEC); -} - -int plannerShared::ascratestops() -{ - return lrint(prefs.ascratestops / TO_MM_BY_SEC); -} -void plannerShared::set_ascratestops(int value) -{ - qPrefDivePlanner::set_ascratestops(value * TO_MM_BY_SEC); -} - -int plannerShared::ascrate50() -{ - return lrint(prefs.ascrate50 / TO_MM_BY_SEC); -} -void plannerShared::set_ascrate50(int value) -{ - qPrefDivePlanner::set_ascrate50(value * TO_MM_BY_SEC); -} - -int plannerShared::ascrate75() -{ - return lrint(prefs.ascrate75 / TO_MM_BY_SEC); -} -void plannerShared::set_ascrate75(int value) -{ - qPrefDivePlanner::set_ascrate75(value * TO_MM_BY_SEC); -} - -int plannerShared::descrate() -{ - return lrint(prefs.descrate / TO_MM_BY_SEC); -} -void plannerShared::set_descrate(int value) -{ - qPrefDivePlanner::set_descrate(value * TO_MM_BY_SEC); -} - diff --git a/core/plannershared.h b/core/plannershared.h deleted file mode 100644 index 136eb9cdf..000000000 --- a/core/plannershared.h +++ /dev/null @@ -1,55 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef PLANNERSHARED_H -#define PLANNERSHARED_H -#include <QObject> - -// This is a shared class (mobile/desktop), and contains the core of the diveplanner -// without UI entanglement. -// It make variables and functions available to QML, these are referenced directly -// in the desktop version -// -// The mobile diveplanner shows all diveplans, but the editing functionality is -// limited to keep the UI simpler. - -class plannerShared: public QObject { - Q_OBJECT - - // Ascend/Descend data, converted to meter/feet depending on user selection - // Settings these will automatically update the corresponding qPrefDivePlanner - // Variables - Q_PROPERTY(int ascratelast6m READ ascratelast6m WRITE set_ascratelast6m NOTIFY ascratelast6mChanged); - Q_PROPERTY(int ascratestops READ ascratestops WRITE set_ascratestops NOTIFY ascratestopsChanged); - Q_PROPERTY(int ascrate50 READ ascrate50 WRITE set_ascrate50 NOTIFY ascrate50Changed); - Q_PROPERTY(int ascrate75 READ ascrate75 WRITE set_ascrate75 NOTIFY ascrate75Changed); - Q_PROPERTY(int descrate READ descrate WRITE set_descrate NOTIFY descrateChanged); -public: - static plannerShared *instance(); - - // Ascend/Descend data, converted to meter/feet depending on user selection - static int ascratelast6m(); - static int ascratestops(); - static int ascrate50(); - static int ascrate75(); - static int descrate(); - -public slots: - // Ascend/Descend data, converted to meter/feet depending on user selection - static void set_ascratelast6m(int value); - static void set_ascratestops(int value); - static void set_ascrate50(int value); - static void set_ascrate75(int value); - static void set_descrate(int value); - -signals: - // Ascend/Descend data, converted to meter/feet depending on user selection - void ascratelast6mChanged(int value); - void ascratestopsChanged(int value); - void ascrate50Changed(int value); - void ascrate75Changed(int value); - void descrateChanged(int value); - -private: - plannerShared() {} -}; - -#endif // PLANNERSHARED_H |