mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive site: replace UUID by pointer in mobile code

Browse source 
Replace UUIDs by pointers to dive-site in mobile code. In both
cases, the value is transported via a QVariant. The function
getCoordinatesForUUID(), which was only used from mobile, can
be replaced by a getCoordinatesFor() function taking a variant
supposed to contain a dive-site pointer. Likewise, the variant
of the centerOnDiveSite function is now supposed to wrap a
pointer-to-divesite.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-25 20:46:12 +02:00 committed by Dirk Hohndel
parent 872d56de01
commit 75b5d61522
7 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -127,9 +127,9 @@ QString DiveObjectHelper::gps_decimal() const
return val; return val;
} }
QVariant DiveObjectHelper::dive_site_uuid() const QVariant DiveObjectHelper::dive_site() const
{ {
return QVariant::fromValue(m_dive->dive_site_uuid); return QVariant::fromValue((void *)get_dive_site_by_uuid(m_dive->dive_site_uuid));
} }
QString DiveObjectHelper::duration() const QString DiveObjectHelper::duration() const

4
core/subsurface-qt/DiveObjectHelper.h
View file

@ -20,7 +20,7 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(QString location READ location CONSTANT) Q_PROPERTY(QString location READ location CONSTANT)
Q_PROPERTY(QString gps READ gps CONSTANT) Q_PROPERTY(QString gps READ gps CONSTANT)
Q_PROPERTY(QString gps_decimal READ gps_decimal CONSTANT) Q_PROPERTY(QString gps_decimal READ gps_decimal CONSTANT)
Q_PROPERTY(QVariant dive_site_uuid READ dive_site_uuid CONSTANT) Q_PROPERTY(QVariant dive_site READ dive_site CONSTANT)
Q_PROPERTY(QString duration READ duration CONSTANT) Q_PROPERTY(QString duration READ duration CONSTANT)
Q_PROPERTY(bool noDive READ noDive CONSTANT) Q_PROPERTY(bool noDive READ noDive CONSTANT)
Q_PROPERTY(QString depth READ depth CONSTANT) Q_PROPERTY(QString depth READ depth CONSTANT)
@ -65,7 +65,7 @@ public:
QString location() const; QString location() const;
QString gps() const; QString gps() const;
QString gps_decimal() const; QString gps_decimal() const;
QVariant dive_site_uuid() const; QVariant dive_site() const;
QString duration() const; QString duration() const;
bool noDive() const; bool noDive() const;
QString depth() const; QString depth() const;

10
map-widget/qmlmapwidgethelper.cpp
View file

@ -22,19 +22,17 @@ MapWidgetHelper::MapWidgetHelper(QObject *parent) : QObject(parent)
this, SLOT(selectedLocationChanged(MapLocation *))); this, SLOT(selectedLocationChanged(MapLocation *)));
} }
QGeoCoordinate MapWidgetHelper::getCoordinatesForUUID(QVariant dive_site_uuid) QGeoCoordinate MapWidgetHelper::getCoordinates(QVariant dive_site)
{ {
const uint32_t uuid = qvariant_cast<uint32_t>(dive_site_uuid); struct dive_site *ds = (struct dive_site *)dive_site.value<uintptr_t>();
struct dive_site *ds = get_dive_site_by_uuid(uuid);
if (!ds || !dive_site_has_gps_location(ds)) if (!ds || !dive_site_has_gps_location(ds))
return QGeoCoordinate(0.0, 0.0); return QGeoCoordinate(0.0, 0.0);
return QGeoCoordinate(ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001); return QGeoCoordinate(ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001);
} }
void MapWidgetHelper::centerOnDiveSiteUUID(QVariant dive_site_uuid) void MapWidgetHelper::centerOnDiveSite(QVariant dive_site)
{ {
const uint32_t uuid = qvariant_cast<uint32_t>(dive_site_uuid); struct dive_site *ds = (struct dive_site *)dive_site.value<uintptr_t>();
struct dive_site *ds = get_dive_site_by_uuid(uuid);
if (ds) if (ds)
centerOnDiveSite(ds); centerOnDiveSite(ds);
} }

4
map-widget/qmlmapwidgethelper.h
View file

@ -29,8 +29,8 @@ public:
void centerOnDiveSite(struct dive_site *); void centerOnDiveSite(struct dive_site *);
void centerOnSelectedDiveSite(); void centerOnSelectedDiveSite();
Q_INVOKABLE QGeoCoordinate getCoordinatesForUUID(QVariant dive_site_uuid); Q_INVOKABLE QGeoCoordinate getCoordinates(QVariant dive_site);
Q_INVOKABLE void centerOnDiveSiteUUID(QVariant dive_site_uuid); Q_INVOKABLE void centerOnDiveSite(QVariant dive_site);
Q_INVOKABLE void reloadMapLocations(); Q_INVOKABLE void reloadMapLocations();
Q_INVOKABLE void copyToClipboardCoordinates(QGeoCoordinate coord, bool formatTraditional); Q_INVOKABLE void copyToClipboardCoordinates(QGeoCoordinate coord, bool formatTraditional);
Q_INVOKABLE void calculateSmallCircleRadius(QGeoCoordinate coord); Q_INVOKABLE void calculateSmallCircleRadius(QGeoCoordinate coord);

2
mobile-widgets/qml/DiveDetails.qml
View file

@ -180,7 +180,7 @@ Kirigami.Page {
} }
onTriggered: { onTriggered: {
showMap() showMap()
mapPage.centerOnDiveSiteUUID(currentItem.modelData.dive.dive_site_uuid) mapPage.centerOnDiveSite(currentItem.modelData.dive.dive_site)
} }
} }

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

@ -52,7 +52,7 @@ Item {
enabled: dive.gps_decimal !== "" enabled: dive.gps_decimal !== ""
onClicked: { onClicked: {
showMap() showMap()
mapPage.centerOnDiveSiteUUID(dive.dive_site_uuid) mapPage.centerOnDiveSite(dive.dive_site)
} }
} }
} }
@ -63,7 +63,7 @@ Item {
text: qsTr("Map it") text: qsTr("Map it")
onClicked: { onClicked: {
showMap() showMap()
mapPage.centerOnDiveSiteUUID(dive.dive_site_uuid) mapPage.centerOnDiveSite(dive.dive_site)
} }
} }
Row { Row {

12
mobile-widgets/qml/MapPage.qml
View file

@ -40,19 +40,19 @@ Kirigami.Page {
mapWidget.mapHelper.reloadMapLocations() mapWidget.mapHelper.reloadMapLocations()
} }
function centerOnDiveSiteUUID(uuid) { function centerOnDiveSite(ds) {
if (!uuid) { if (!ds) {
console.warn("main.qml: centerOnDiveSiteUUI(): uuid is undefined!") console.warn("main.qml: centerOnDiveSite(): dive site is undefined!")
return return
} }
// on firstRun, hard pan/center the map to the desired location so that // on firstRun, hard pan/center the map to the desired location so that
// we don't start at an arbitrary location such as [0,0] or London. // we don't start at an arbitrary location such as [0,0] or London.
if (firstRun) { if (firstRun) {
var coord = mapWidget.mapHelper.getCoordinatesForUUID(uuid) var coord = mapWidget.mapHelper.getCoordinates(ds)
centerOnLocationHard(coord.latitude, coord.longitude) centerOnLocationHard(coord.latitude, coord.longitude)
firstRun = false firstRun = false
} // continue here as centerOnDiveSiteUUID() also does marker selection. } // continue here as centerOnDiveSite() also does marker selection.
mapWidget.mapHelper.centerOnDiveSiteUUID(uuid) mapWidget.mapHelper.centerOnDiveSite(ds)
} }
function centerOnLocation(lat, lon) { function centerOnLocation(lat, lon) {