mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-02 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile: provide better tracking of applied GPS fixes

Browse source 
Also reset the page stack to make sure we don't end up with stale data.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-10-22 21:57:02 -04:00
parent 4c55074bd7
commit bf6a644fc6
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/gpslocation.cpp
View file

@ -225,14 +225,14 @@ static void copy_gps_location(struct gpsTracker &gps, struct dive *d)
#define SET_LOCATION(_dive, _gpsfix, _mark) \ #define SET_LOCATION(_dive, _gpsfix, _mark) \
{ \ { \
copy_gps_location(_gpsfix, _dive); \ copy_gps_location(_gpsfix, _dive); \
changed = true; \ changed++; \
last = _mark; \ last = _mark; \
} }
bool GpsLocation::applyLocations() int GpsLocation::applyLocations()
{ {
int i; int i;
bool changed = false; int changed = 0;
int last = 0; int last = 0;
int cnt = m_trackers.count(); int cnt = m_trackers.count();
if (cnt == 0) if (cnt == 0)
@ -317,7 +317,7 @@ bool GpsLocation::applyLocations()
} }
} }
if (changed) if (changed > 0)
mark_divelist_changed(true); mark_divelist_changed(true);
return changed; return changed;
} }

2
core/gpslocation.h
View file

@ -27,7 +27,7 @@ public:
~GpsLocation(); ~GpsLocation();
static GpsLocation *instance(); static GpsLocation *instance();
static bool hasInstance(); static bool hasInstance();
bool applyLocations(); int applyLocations();
int getGpsNum() const; int getGpsNum() const;
bool hasLocationsSource(); bool hasLocationsSource();
QString currentPosition(); QString currentPosition();

4
mobile-widgets/qml/main.qml
View file

@ -292,6 +292,10 @@ Kirigami.ApplicationWindow {
globalDrawer.close() globalDrawer.close()
diveModel.resetInternalData() diveModel.resetInternalData()
manager.refreshDiveList() manager.refreshDiveList()
while (pageStack.depth > 1) {
pageStack.pop()
}
pageStack.push(diveList)
} }
} }
Kirigami.Action { Kirigami.Action {

8
mobile-widgets/qmlmanager.cpp
View file

@ -1577,8 +1577,12 @@ QString QMLManager::getCurrentPosition()
void QMLManager::applyGpsData() void QMLManager::applyGpsData()
{ {
if (locationProvider->applyLocations()) appendTextToLog("Applying GPS fiexs");
refreshDiveList(); int cnt = locationProvider->applyLocations();
if (cnt == 0)
return;
appendTextToLog(QString("Attached %1 GPS fixes").arg(cnt));
refreshDiveList();
} }
void QMLManager::populateGpsData() void QMLManager::populateGpsData()