diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-30 18:09:37 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-09-06 11:48:47 -0700 |
commit | 652b78657ebe18ff101d3f6cd2ac9f3458db1881 (patch) | |
tree | 10df535833370de16c1ff056af6806d533f8ed55 /qt-models/maplocationmodel.cpp | |
parent | b7665251835cb6786c3b268fd0d04d69dccf36ed (diff) | |
download | subsurface-652b78657ebe18ff101d3f6cd2ac9f3458db1881.tar.gz |
Map: calculate the z value in the model
Since not fully reloading the map on selection change,
the selected sites were not moved to the top. Not calculating
the z-value in QML, but making it a simple model property
helps.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models/maplocationmodel.cpp')
-rw-r--r-- | qt-models/maplocationmodel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp index 10d983575..4ca4a3a53 100644 --- a/qt-models/maplocationmodel.cpp +++ b/qt-models/maplocationmodel.cpp @@ -14,6 +14,7 @@ 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"; +const char *MapLocation::PROPERTY_NAME_Z = "z"; #define MIN_DISTANCE_BETWEEN_DIVE_SITES_M 50.0 @@ -51,6 +52,8 @@ QVariant MapLocation::getRole(int role) const return m_selected ? QString("qrc:///dive-location-marker-selected-icon") : inEditMode() ? QString("qrc:///dive-location-marker-inactive-icon") : QString("qrc:///dive-location-marker-icon"); + case Roles::RoleZ: + return m_selected ? 1 : 0; default: return QVariant(); } @@ -88,6 +91,7 @@ MapLocationModel::MapLocationModel(QObject *parent) : QAbstractListModel(parent) 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; + m_roles[MapLocation::Roles::RoleZ] = MapLocation::PROPERTY_NAME_Z; connect(&diveListNotifier, &DiveListNotifier::diveSiteChanged, this, &MapLocationModel::diveSiteChanged); } |