From 4f10f7f7ae9b791f08cf97ec64f9a8a0468145c2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 10 Jan 2016 19:34:21 -0800 Subject: QML UI: refresh divelist after GPS data was successfully applied And create a helper to do so to make the code simpler. Signed-off-by: Dirk Hohndel --- qt-mobile/qmlmanager.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'qt-mobile/qmlmanager.cpp') diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp index df20de11d..7d50884ab 100644 --- a/qt-mobile/qmlmanager.cpp +++ b/qt-mobile/qmlmanager.cpp @@ -312,6 +312,17 @@ void QMLManager::loadDivesWithValidCredentials() setLoadFromCloud(true); } +void QMLManager::refreshDiveList() +{ + int i; + struct dive *d; + DiveListModel::instance()->clear(); + for_each_dive(i, d) { + DiveListModel::instance()->addDive(d); + } + +} + // update the dive and return the notes field, stripped of the HTML junk QString QMLManager::commitChanges(QString diveId, QString date, QString location, QString gps, QString duration, QString depth, QString airtemp, QString watertemp, QString suit, QString buddy, QString diveMaster, QString notes) @@ -455,11 +466,7 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location if (needResort) sort_table(&dive_table); if (diveChanged || needResort) { - int i; - DiveListModel::instance()->clear(); - for_each_dive(i, d) { - DiveListModel::instance()->addDive(d); - } + refreshDiveList(); mark_divelist_changed(true); } return notes; @@ -501,7 +508,8 @@ QString QMLManager::getCurrentPosition() void QMLManager::applyGpsData() { - locationProvider->applyLocations(); + if (locationProvider->applyLocations()) + refreshDiveList(); } void QMLManager::sendGpsData() -- cgit v1.2.3-70-g09d2