From 7751ec1c78642ffcc470ad8714a87851fd5b069d Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Sat, 14 Dec 2019 23:12:26 +0100 Subject: 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 --- backend-shared/CMakeLists.txt | 2 ++ backend-shared/plannershared.cpp | 61 +++++++++++++++++++++++++++++++++++++ backend-shared/plannershared.h | 55 +++++++++++++++++++++++++++++++++ core/CMakeLists.txt | 2 -- core/plannershared.cpp | 61 ------------------------------------- core/plannershared.h | 55 --------------------------------- desktop-widgets/diveplanner.cpp | 2 +- packaging/ios/Subsurface-mobile.pro | 4 +-- subsurface-helper.cpp | 2 +- 9 files changed, 122 insertions(+), 122 deletions(-) create mode 100644 backend-shared/plannershared.cpp create mode 100644 backend-shared/plannershared.h delete mode 100644 core/plannershared.cpp delete mode 100644 core/plannershared.h diff --git a/backend-shared/CMakeLists.txt b/backend-shared/CMakeLists.txt index b6502bfdf..fdfdb1e05 100644 --- a/backend-shared/CMakeLists.txt +++ b/backend-shared/CMakeLists.txt @@ -3,6 +3,8 @@ set(BACKEND_SRCS exportfuncs.cpp exportfuncs.h + plannershared.cpp + plannershared.h ) add_library(subsurface_backend_shared STATIC ${BACKEND_SRCS}) diff --git a/backend-shared/plannershared.cpp b/backend-shared/plannershared.cpp new file mode 100644 index 000000000..ff95b9e0e --- /dev/null +++ b/backend-shared/plannershared.cpp @@ -0,0 +1,61 @@ +// 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/backend-shared/plannershared.h b/backend-shared/plannershared.h new file mode 100644 index 000000000..136eb9cdf --- /dev/null +++ b/backend-shared/plannershared.h @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef PLANNERSHARED_H +#define PLANNERSHARED_H +#include + +// 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 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 - -// 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 diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index 5f769cba1..2769befe0 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -7,7 +7,7 @@ #include "core/units.h" #include "core/settings/qPrefDivePlanner.h" #include "core/gettextfromc.h" -#include "core/plannershared.h" +#include "backend-shared/plannershared.h" #include "qt-models/cylindermodel.h" #include "qt-models/models.h" diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 97c939275..bfbf8e413 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -87,7 +87,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/uploadDiveShare.cpp \ ../../core/uploadDiveLogsDE.cpp \ ../../core/save-profiledata.c \ - ../../core/plannershared.cpp \ ../../core/settings/qPref.cpp \ ../../core/settings/qPrefCloudStorage.cpp \ ../../core/settings/qPrefDisplay.cpp \ @@ -107,6 +106,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/subsurface-qt/DiveObjectHelper.cpp \ ../../core/subsurface-qt/DiveListNotifier.cpp \ ../../backend-shared/exportfuncs.cpp \ + ../../backend-shared/plannershared.cpp \ ../../mobile-widgets/qmlmanager.cpp \ ../../mobile-widgets/qmlprefs.cpp \ ../../qt-models/divelistmodel.cpp \ @@ -212,7 +212,6 @@ HEADERS += \ ../../core/save-profiledata.h \ ../../core/uploadDiveShare.h \ ../../core/uploadDiveLogsDE.h \ - ../../core/plannershared.h \ ../../core/settings/qPref.h \ ../../core/settings/qPrefCloudStorage.h \ ../../core/settings/qPrefDisplay.h \ @@ -232,6 +231,7 @@ HEADERS += \ ../../core/subsurface-qt/DiveObjectHelper.h \ ../../core/subsurface-qt/DiveListNotifier.h \ ../../backend-shared/exportfuncs.h \ + ../../backend-shared/plannershared.h \ ../../mobile-widgets/qmlmanager.h \ ../../mobile-widgets/qmlprefs.h \ ../../map-widget/qmlmapwidgethelper.h \ diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index a19c52a2f..136aee4d4 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -20,7 +20,7 @@ #include "qt-models/messagehandlermodel.h" #include "profile-widget/qmlprofile.h" #include "core/downloadfromdcthread.h" -#include "core/plannershared.h" +#include "backend-shared/plannershared.h" #include "qt-models/diveimportedmodel.h" #include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h" #else -- cgit v1.2.3-70-g09d2