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>

7 files changed, 44 insertions, 8 deletions

diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp
index 233b825eb..27c30686f 100644
--- a/desktop-widgets/mapwidget.cpp
+++ b/desktop-widgets/mapwidget.cpp
@@ -79,6 +79,11 @@ void MapWidget::reload()
 	m_mapHelper->centerOnSelectedDiveSite();
 }
 
+bool MapWidget::editMode() const
+{
+	return isReady && m_mapHelper->editMode();
+}
+
 void MapWidget::selectedDivesChanged(const QList<int> &list)
 {
 	CHECK_IS_READY_RETURN_VOID();
diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h
index c534c1bb3..bc9303166 100644
--- a/desktop-widgets/mapwidget.h
+++ b/desktop-widgets/mapwidget.h
@@ -23,6 +23,7 @@ public:
 
 	static MapWidget *instance();
 	void reload();
+	bool editMode() const;
 
 public slots:
 	void centerOnDiveSite(struct dive_site *);
diff --git a/map-widget/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml
index 42fc0ab88..5b85aaa24 100644
--- a/map-widget/qml/MapWidget.qml
+++ b/map-widget/qml/MapWidget.qml
@@ -59,7 +59,7 @@ Item {
 				z: mapHelper.model.isSelected(model.divesite) ? mapHelper.model.count - 1 : 0
 				sourceItem: Image {
 					id: mapItemImage
-					source: "qrc:///dive-location-marker" + (mapHelper.model.isSelected(model.divesite) ? "-selected" : (mapHelper.editMode ? "-inactive" : "")) + "-icon"
+					source: model.pixmap
 					SequentialAnimation {
 						id: mapItemImageAnimation
 						PropertyAnimation { target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120 }
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index a40fa1d9f..feaccdbef 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -11,6 +11,7 @@
 #include "qt-models/divelocationmodel.h"
 #ifndef SUBSURFACE_MOBILE
 #include "qt-models/filtermodels.h"
+#include "desktop-widgets/mapwidget.h"
 #endif
 
 #define SMALL_CIRCLE_RADIUS_PX            26.0
@@ -235,6 +236,11 @@ void MapWidgetHelper::diveSiteChanged(struct dive_site *ds, int field)
 	centerOnDiveSite(ds);
 }
 
+bool MapWidgetHelper::editMode() const
+{
+	return m_editMode;
+}
+
 QString MapWidgetHelper::pluginObject()
 {
 	QString lang = uiLanguage(NULL).replace('_', '-');
diff --git a/map-widget/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h
index 3560a51d1..af469193e 100644
--- a/map-widget/qmlmapwidgethelper.h
+++ b/map-widget/qmlmapwidgethelper.h
@@ -37,6 +37,7 @@ public:
 	Q_INVOKABLE void selectVisibleLocations();
 	Q_INVOKABLE void selectedLocationChanged(struct dive_site *ds);
 	QString pluginObject();
+	bool editMode() const;
 
 private:
 	void updateEditMode();
diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp
index 452c49b8d..0fe86f596 100644
--- a/qt-models/maplocationmodel.cpp
+++ b/qt-models/maplocationmodel.cpp
@@ -4,6 +4,7 @@
 #include "core/divesite.h"
 #ifndef SUBSURFACE_MOBILE
 #include "qt-models/filtermodels.h"
+#include "desktop-widgets/mapwidget.h"
 #endif
 
 #include <QDebug>
@@ -12,18 +13,31 @@
 const char *MapLocation::PROPERTY_NAME_COORDINATE = "coordinate";
 const char *MapLocation::PROPERTY_NAME_DIVESITE   = "divesite";
 const char *MapLocation::PROPERTY_NAME_NAME       = "name";
+const char *MapLocation::PROPERTY_NAME_PIXMAP     = "pixmap";
 
 #define MIN_DISTANCE_BETWEEN_DIVE_SITES_M 50.0
 
-MapLocation::MapLocation() : m_ds(nullptr)
+MapLocation::MapLocation() : m_ds(nullptr), m_selected(false)
 {
 }
 
-MapLocation::MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name) :
-    m_ds(ds), m_coordinate(coord), m_name(name)
+MapLocation::MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name, bool selected) :
+    m_ds(ds), m_coordinate(coord), m_name(name), m_selected(selected)
 {
 }
 
+// Check whether we are in divesite-edit mode. This doesn't
+// exist on mobile. And on desktop we have to access the MapWidget.
+// Simplify this!
+static bool inEditMode()
+{
+#ifdef SUBSURFACE_MOBILE
+	return false;
+#else
+	return MapWidget::instance()->editMode();
+#endif
+}
+
 QVariant MapLocation::getRole(int role) const
 {
 	switch (role) {
@@ -33,6 +47,10 @@ QVariant MapLocation::getRole(int role) const
 		return QVariant::fromValue(m_coordinate);
 	case Roles::RoleName:
 		return QVariant::fromValue(m_name);
+	case Roles::RolePixmap:
+		return m_selected ? QString("qrc:///dive-location-marker-selected-icon") :
+		       inEditMode() ? QString("qrc:///dive-location-marker-inactive-icon") :
+				    QString("qrc:///dive-location-marker-icon");
 	default:
 		return QVariant();
 	}
@@ -69,6 +87,7 @@ MapLocationModel::MapLocationModel(QObject *parent) : QAbstractListModel(parent)
 	m_roles[MapLocation::Roles::RoleDivesite] = MapLocation::PROPERTY_NAME_DIVESITE;
 	m_roles[MapLocation::Roles::RoleCoordinate] = MapLocation::PROPERTY_NAME_COORDINATE;
 	m_roles[MapLocation::Roles::RoleName] = MapLocation::PROPERTY_NAME_NAME;
+	m_roles[MapLocation::Roles::RolePixmap] = MapLocation::PROPERTY_NAME_PIXMAP;
 	connect(&diveListNotifier, &DiveListNotifier::diveSiteChanged, this, &MapLocationModel::diveSiteChanged);
 }
 
@@ -184,7 +203,8 @@ void MapLocationModel::reload(QObject *map)
 					continue;
 			}
 		}
-		MapLocation *location = new MapLocation(ds, dsCoord, name);
+		bool selected = m_selectedDs.contains(ds);
+		MapLocation *location = new MapLocation(ds, dsCoord, name, selected);
 		m_mapLocations.append(location);
 		if (!diveSiteMode)
 			locationNameMap[name] = location;
@@ -243,6 +263,5 @@ void MapLocationModel::diveSiteChanged(struct dive_site *ds, int field)
 		break;
 	}
 
-
 	emit dataChanged(createIndex(row, 0), createIndex(row, 0));
 }
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();