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

Map: generate pixmap name in model

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2019-08-30 15:25:59 +02:00 • committed by Dirk Hohndel
parent 28cb75b73d
commit bce31ab862
7 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-models/maplocationmodel.h
View file

@ -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();