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

Dive site: Pass dive-site pointer to MapWidgetHelper::enterEditMode()

Browse source 
Replace the uuid argument to MapWidgetHelper::enterEditMode() by a
pointer. Likewise, adapt the only caller prepareForGetDiveCoordinates().
This is a small step in a bigger effort to replace dive-site UUIDs
by pointers.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-25 10:07:45 +02:00 • committed by Dirk Hohndel
parent b9b1b3146b
commit cedc23f487
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
map-widget/qmlmapwidgethelper.cpp
View file

@ -288,24 +288,23 @@ void MapWidgetHelper::exitEditMode()
emit editModeChanged();
}
void MapWidgetHelper::enterEditMode(quint32 uuid)
void MapWidgetHelper::enterEditMode(struct dive_site *ds)
{
// We don't support editing of a dive site that doesn't exist
struct dive_site *ds = get_dive_site_by_uuid(uuid);
if (!ds)
return;
m_editMode = true;
MapLocation *exists = m_mapLocationModel->getMapLocationForUuid(uuid);
MapLocation *exists = m_mapLocationModel->getMapLocationForUuid(ds->uuid);
QGeoCoordinate coord;
// if divesite doesn't exist in the model, add a new MapLocation.
if (!exists) {
coord = m_map->property("center").value<QGeoCoordinate>();
m_mapLocationModel->add(new MapLocation(uuid, coord, QString(ds->name)));
m_mapLocationModel->add(new MapLocation(ds->uuid, coord, QString(ds->name)));
} else {
coord = exists->coordinate();
}
centerOnDiveSiteUUID(uuid);
centerOnDiveSite(ds);
location_t location = mk_location(coord);
emit coordinatesChanged(location);
emit editModeChanged();