diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-30 15:25:59 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-06 11:48:47 -0700 |
| commit | bce31ab8621537441b42389801e20de56861438c (patch) | |
| tree | ae5886ec0a33304666817cea0240a07615861f1c /map-widget | |
| parent | 28cb75b73d3d0fa4cd8dcf3aa5884e93cb13a5d2 (diff) | |
| download | subsurface-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 'map-widget')
| -rw-r--r-- | map-widget/qml/MapWidget.qml | 2 | ||||
| -rw-r--r-- | map-widget/qmlmapwidgethelper.cpp | 6 | ||||
| -rw-r--r-- | map-widget/qmlmapwidgethelper.h | 1 |
3 files changed, 8 insertions, 1 deletions
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(); |