diff options
| -rw-r--r-- | mobile-widgets/qml/DiveSummary.qml | 5 | ||||
| -rw-r--r-- | mobile-widgets/qmlinterface.cpp | 10 | ||||
| -rw-r--r-- | mobile-widgets/qmlinterface.h | 10 |
3 files changed, 2 insertions, 23 deletions
diff --git a/mobile-widgets/qml/DiveSummary.qml b/mobile-widgets/qml/DiveSummary.qml index 53eda5190..8f592ba4d 100644 --- a/mobile-widgets/qml/DiveSummary.qml +++ b/mobile-widgets/qml/DiveSummary.qml @@ -33,14 +33,13 @@ Kirigami.ScrollablePage { Connections { target: Backend onLengthChanged: { - Backend.summaryCalculation(selectionPrimary.currentIndex, selectionSecondary.currentIndex) + reload() } onVolumeChanged: { - Backend.summaryCalculation(selectionPrimary.currentIndex, selectionSecondary.currentIndex) + reload() } } - GridLayout { columns: 3 width: parent.width diff --git a/mobile-widgets/qmlinterface.cpp b/mobile-widgets/qmlinterface.cpp index 4bf23dedf..e70c73cb9 100644 --- a/mobile-widgets/qmlinterface.cpp +++ b/mobile-widgets/qmlinterface.cpp @@ -89,14 +89,4 @@ void QMLInterface::setup(QQmlContext *ct) // Make enums available as types qmlRegisterUncreatableType<QMLInterface>("org.subsurfacedivelog.mobile",1,0,"Enums","Enum is not a type"); - - // calculate divesummary first time. - // this is needed in order to load the divesummary page - diveSummary::summaryCalculation(0, 3); -} - -void QMLInterface::summaryCalculation(int primaryPeriod, int secondaryPeriod) -{ - diveSummary::summaryCalculation(primaryPeriod, secondaryPeriod); - emit diveSummaryTextChanged(diveSummary::diveSummaryText); } diff --git a/mobile-widgets/qmlinterface.h b/mobile-widgets/qmlinterface.h index c8383387d..efa34cdc0 100644 --- a/mobile-widgets/qmlinterface.h +++ b/mobile-widgets/qmlinterface.h @@ -8,7 +8,6 @@ #include "core/settings/qPrefTechnicalDetails.h" #include "qt-models/diveplannermodel.h" #include "backend-shared/plannershared.h" -#include "backend-shared/divesummary.h" #include <QObject> #include <QQmlContext> @@ -79,8 +78,6 @@ class QMLInterface : public QObject { Q_PROPERTY(bool verbatim_plan READ verbatim_plan WRITE set_verbatim_plan NOTIFY verbatim_planChanged); Q_PROPERTY(bool display_variations READ display_variations WRITE set_display_variations NOTIFY display_variationsChanged); - Q_PROPERTY(QStringList diveSummaryText READ diveSummaryText NOTIFY diveSummaryTextChanged); - public: // function to do the needed setup static void setup(QQmlContext *ct); @@ -168,9 +165,6 @@ public: }; Q_ENUM(DIVE_MODE); - // Function to calculate dive summary - Q_INVOKABLE void summaryCalculation(int primaryPeriod, int secondaryPeriod); - public: CLOUD_STATUS cloud_verification_status() { return (CLOUD_STATUS)prefs.cloud_verification_status; } DURATION duration_units() { return (DURATION)prefs.units.duration_units; } @@ -218,8 +212,6 @@ public: bool verbatim_plan() { return prefs.verbatim_plan; } bool display_variations() { return prefs.display_variations; } - const QStringList &diveSummaryText() { return diveSummary::diveSummaryText; } - public slots: void set_cloud_verification_status(CLOUD_STATUS value) { qPrefCloudStorage::set_cloud_verification_status(value); } void set_duration_units(DURATION value) { qPrefUnits::set_duration_units((units::DURATION)value); } @@ -315,8 +307,6 @@ signals: void display_transitionsChanged(bool value); void verbatim_planChanged(bool value); void display_variationsChanged(bool value); - - void diveSummaryTextChanged(QStringList); private: QMLInterface(); }; |