mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: partial, slow and incomplete implementation of delete GPS fix

Browse source 
This only deletes the fix on the mobile device, not on the server.
And it is really really slow. Re-reading the data from the settings just isn't
a smart way to do this.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-08 23:18:41 -08:00
parent 038cfcba91
commit b1f90b6aa0
5 changed files with 50 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qt-mobile/qml/GpsList.qml
View file

@ -91,6 +91,7 @@ MobileComponents.Page {
iconName: "trash-empty"
onTriggered: {
print("delete this!")
manager.deleteGpsFix(when)
}
},
Action {

7
qt-mobile/qmlmanager.cpp
View file

@ -528,6 +528,13 @@ void QMLManager::clearGpsData()
populateGpsData();
}
void QMLManager::deleteGpsFix(quint64 when)
{
locationProvider->deleteGpsFix(when);
populateGpsData();
}
QString QMLManager::logText() const
{
QString logText = m_logText + QString("\nNumer of GPS fixes: %1").arg(locationProvider->getGpsNum());

1
qt-mobile/qmlmanager.h
View file

@ -85,6 +85,7 @@ public slots:
QString getNumber(QString diveId);
QString getDate(QString diveId);
QString getCurrentPosition();
void deleteGpsFix(quint64 when);
private:
QString m_cloudUserName;

39
subsurface-core/gpslocation.cpp
View file

@ -327,6 +327,11 @@ void GpsLocation::applyLocations()
mark_divelist_changed(true);
}
static int timeCompare(const gpsTracker &a, const gpsTracker &b)
{
return a.when <= b.when;
}
QVector< gpsTracker > GpsLocation::currentGPSInfo() const
{
QVector<gpsTracker> trackers;
@ -348,9 +353,43 @@ QVector< gpsTracker > GpsLocation::currentGPSInfo() const
gt.name = geoSettings->value(QString("gpsFix%1_name").arg(i)).toString();
trackers.append(gt);
}
std::sort(trackers.begin(), trackers.end(), timeCompare);
return trackers;
}
void GpsLocation::deleteGpsFix(quint64 when)
{
int cnt = geoSettings->value("count", 0).toInt();
if (cnt == 0) {
qDebug() << "no gps fixes";
return;
}
bool found = false;
int i;
struct gpsTracker gt;
for (i = 0; i < cnt; i++) {
if (geoSettings->value(QString("gpsFix%1_time").arg(i)).toULongLong() == when) {
if (i < cnt - 1) {
geoSettings->setValue(QString("gpsFix%1_lat").arg(i), geoSettings->value(QString("gpsFix%1_lat").arg(cnt - 1)));
geoSettings->setValue(QString("gpsFix%1_lon").arg(i), geoSettings->value(QString("gpsFix%1_lon").arg(cnt - 1)));
geoSettings->setValue(QString("gpsFix%1_time").arg(i), geoSettings->value(QString("gpsFix%1_time").arg(cnt - 1)));
geoSettings->setValue(QString("gpsFix%1_name").arg(i), geoSettings->value(QString("gpsFix%1_name").arg(cnt - 1)));
}
found = true;
break;
}
}
if (found) {
geoSettings->remove(QString("gpsFix%1_lat").arg(cnt - 1));
geoSettings->remove(QString("gpsFix%1_lon").arg(cnt - 1));
geoSettings->remove(QString("gpsFix%1_time").arg(cnt - 1));
geoSettings->remove(QString("gpsFix%1_name").arg(cnt - 1));
cnt--;
geoSettings->setValue("count", cnt);
}
qDebug() << "found" << found << "at position" << i << "of" << cnt + 1;
}
void GpsLocation::clearGpsData()
{
geoSettings->clear();

4
subsurface-core/gpslocation.h
View file

@ -12,7 +12,7 @@
struct gpsTracker {
degrees_t latitude;
degrees_t longitude;
time_t when;
quint64 when;
QString name;
};
@ -52,7 +52,7 @@ public slots:
void postError(QNetworkReply::NetworkError error);
void getUseridError(QNetworkReply::NetworkError error);
void clearGpsData();
void deleteGpsFix(quint64 when);
};
#endif // GPSLOCATION_H