summaryrefslogtreecommitdiffstats
path: root/qt-models/maplocationmodel.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-08-30 15:25:59 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-09-06 11:48:47 -0700
commitbce31ab8621537441b42389801e20de56861438c (patch)
treeae5886ec0a33304666817cea0240a07615861f1c /qt-models/maplocationmodel.h
parent28cb75b73d3d0fa4cd8dcf3aa5884e93cb13a5d2 (diff)
downloadsubsurface-bce31ab8621537441b42389801e20de56861438c.tar.gz
Map: generate pixmap name in model
Experimentation has shown that the image of a flag will only be changed after dataChanged() if it is a simple property. The old code had a complex QML expression and then - for some reason - it didn't work. To give us better control over the flags and avoid full reloads of the map therefore introduce a model-property pixmap name. The name depends on whether the site is selected and if not, whether we are in divesite-edit mode. This makes the code rather convoluted. Firstly, we have to save whether the site is selected in the map-item. Secondly we have to access the global map-widget, which in turn has to go to the map-widget helper (layering violation!). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models/maplocationmodel.h')
-rw-r--r--qt-models/maplocationmodel.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h
index 3fb6f1da8..8cec08818 100644
--- a/qt-models/maplocationmodel.h
+++ b/qt-models/maplocationmodel.h
@@ -21,9 +21,10 @@ public:
static const char *PROPERTY_NAME_COORDINATE;
static const char *PROPERTY_NAME_DIVESITE;
static const char *PROPERTY_NAME_NAME;
+ static const char *PROPERTY_NAME_PIXMAP;
explicit MapLocation();
- explicit MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name);
+ explicit MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name, bool selected);
QVariant getRole(int role) const;
QGeoCoordinate coordinate();
@@ -35,13 +36,16 @@ public:
enum Roles {
RoleDivesite = Qt::UserRole + 1,
RoleCoordinate,
- RoleName
+ RoleName,
+ RolePixmap
};
private:
struct dive_site *m_ds;
QGeoCoordinate m_coordinate;
QString m_name;
+public:
+ bool m_selected = false;
signals:
void coordinateChanged();