diff options
author | Jan Mulder <jlmulder@xs4all.nl> | 2018-01-28 09:52:51 +0100 |
---|---|---|
committer | Jan Mulder <jlmulder@xs4all.nl> | 2018-01-31 14:48:14 +0100 |
commit | fed2c5b6a1c71649bcb310c0bd118cb1abcf9ea0 (patch) | |
tree | 78bd219027237280e3eafb33005583b755079557 /mobile-widgets | |
parent | 728e007c5c3eff08cd3dc213ebc3034a9513d4c9 (diff) | |
download | subsurface-fed2c5b6a1c71649bcb310c0bd118cb1abcf9ea0.tar.gz |
mobile cleanup: unduplicate code and do not loop over dives (1)
This is the first of a set of commits that are (very) similar.
It appeared that a number of more or less static lists, which are
constructed by a loop over all dives in the logbook, were executed
when changing focus to a next dive. For example, the in this
commit addressed list of used dive suits.
What was wrong was that the suitList was linked to a dive. There
is only a need to construct the list of used suits when data is
changed (and obviously, once on startup of the app). Further, it
appeared that a lot of code was duplicated and that we can use
(in this case) the same code from the desktop completionmodels.cpp.
Basically, this commit involves the following changes:
- include completionmodels.cpp in mobile and desktop (so move
it from the desktop only category to the generic category).
- remove double code from DiveObjectHelper.cpp
- Do not differentiate in the init phase and the normal refresh
of the list
- the per dive logic is now only the getting of a previously
constructed list (in init or update of the divelist).
There are no visible changes in the UI, other than a better
performance when scrolling over dive details.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'mobile-widgets')
-rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 3 | ||||
-rw-r--r-- | mobile-widgets/qml/DiveDetailsEdit.qml | 3 | ||||
-rw-r--r-- | mobile-widgets/qml/main.qml | 2 | ||||
-rw-r--r-- | mobile-widgets/qmlmanager.cpp | 17 | ||||
-rw-r--r-- | mobile-widgets/qmlmanager.h | 8 |
5 files changed, 14 insertions, 19 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 1db5efc36..a285e62e4 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -30,7 +30,6 @@ Kirigami.Page { property alias notes: detailsEdit.notesText property alias suitIndex: detailsEdit.suitIndex property alias suitText: detailsEdit.suitText - property alias suitModel: detailsEdit.suitModel property alias weight: detailsEdit.weightText property alias startpressure: detailsEdit.startpressureText property alias endpressure: detailsEdit.endpressureText @@ -237,7 +236,7 @@ Kirigami.Page { depth = currentItem.modelData.dive.depth airtemp = currentItem.modelData.dive.airTemp watertemp = currentItem.modelData.dive.waterTemp - suitIndex = currentItem.modelData.dive.suitList.indexOf(currentItem.modelData.dive.suit) + suitIndex = manager.suitList.indexOf(currentItem.modelData.dive.suit) if (currentItem.modelData.dive.buddy.indexOf(",") > 0) { buddyText = currentItem.modelData.dive.buddy; } else { diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index e680e1734..5808f78a7 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -224,8 +224,7 @@ Item { } HintsTextEdit { id: suitBox - model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.suitList : null + model: manager.suitList inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index da7089d4f..2df8d9f67 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -92,7 +92,7 @@ Kirigami.ApplicationWindow { detailsWindow.location = "" detailsWindow.gps = "" detailsWindow.duration = "" - detailsWindow.suitModel = manager.suitInit + detailsWindow.suitModel = manager.suitList detailsWindow.suitIndex = -1 detailsWindow.suitText = "" detailsWindow.cylinderModel = manager.cylinderInit diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 18db13621..4846dcdec 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -17,6 +17,7 @@ #include "qt-models/divelistmodel.h" #include "qt-models/gpslistmodel.h" +#include "qt-models/completionmodels.h" #include "core/divelist.h" #include "core/device.h" #include "core/pref.h" @@ -272,6 +273,8 @@ void QMLManager::openLocalThenRemote(QString url) appendTextToLog(QStringLiteral("have cloud credentials, trying to connect")); tryRetrieveDataFromBackend(); } + buddyModel.updateModel(); + suitModel.updateModel(); emit suitListChanged(); } void QMLManager::mergeLocalRepo() @@ -1548,19 +1551,9 @@ void QMLManager::quit() QApplication::quit(); } -QStringList QMLManager::suitInit() const +QStringList QMLManager::suitList() const { - QStringList suits; - struct dive *d; - int i = 0; - for_each_dive (i, d) { - QString temp = d->suit; - if (!temp.isEmpty()) - suits << d->suit; - } - suits.removeDuplicates(); - suits.sort(); - return suits; + return suitModel.stringList(); } QStringList QMLManager::buddyInit() const diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index c171eabaf..d0f1c09a2 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -13,6 +13,7 @@ #include "core/gpslocation.h" #include "core/downloadfromdcthread.h" #include "qt-models/divelistmodel.h" +#include "qt-models/completionmodels.h" class QMLManager : public QObject { Q_OBJECT @@ -35,7 +36,7 @@ class QMLManager : public QObject { Q_PROPERTY(bool syncToCloud MEMBER m_syncToCloud WRITE setSyncToCloud NOTIFY syncToCloudChanged) Q_PROPERTY(int updateSelectedDive MEMBER m_updateSelectedDive WRITE setUpdateSelectedDive NOTIFY updateSelectedDiveChanged) Q_PROPERTY(int selectedDiveTimestamp MEMBER m_selectedDiveTimestamp WRITE setSelectedDiveTimestamp NOTIFY selectedDiveTimestampChanged) - Q_PROPERTY(QStringList suitInit READ suitInit CONSTANT) + Q_PROPERTY(QStringList suitList READ suitList NOTIFY suitListChanged) Q_PROPERTY(QStringList buddyInit READ buddyInit CONSTANT) Q_PROPERTY(QStringList divemasterInit READ divemasterInit CONSTANT) Q_PROPERTY(QStringList cylinderInit READ cylinderInit CONSTANT) @@ -130,7 +131,7 @@ public: DiveListSortModel *dlSortModel; - QStringList suitInit() const; + QStringList suitList() const; QStringList buddyInit() const; QStringList divemasterInit() const; QStringList cylinderInit() const; @@ -196,6 +197,8 @@ public slots: private: + BuddyCompletionModel buddyModel; + SuitCompletionModel suitModel; QString m_cloudUserName; QString m_cloudPassword; QString m_cloudPin; @@ -267,6 +270,7 @@ signals: void libdcLogChanged(); void developerChanged(); void btEnabledChanged(); + void suitListChanged(); }; #endif |