diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-15 14:16:17 +0100 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-28 11:10:19 +0000 |
commit | 4e96893901c39fd7a65751549ec82bd18475006f (patch) | |
tree | 61a788a46deffd4f9fe7471a444a554bb1432ad8 /src/location/declarativemaps/qdeclarativegeomap_p.h | |
parent | ba2a82b7db86d96fc1f110b4bbc88408f47a5774 (diff) | |
download | qtlocation-4e96893901c39fd7a65751549ec82bd18475006f.tar.gz |
Make min/max Tilt/FieldOfView Read/Write
This change makes the currently read only properties minimumTilt,
maximumTilt, minimumFieldOfView and maximumFieldOfView user-settable
as well, like minimum and maximum zoom level.
Autotests are included.
Task-number: QTBUG-58931
Change-Id: I784be7bd0d960061e94bc40cd8a45e466754526f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap_p.h')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap_p.h | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h index f69ca6a1..6a6b36a9 100644 --- a/src/location/declarativemaps/qdeclarativegeomap_p.h +++ b/src/location/declarativemaps/qdeclarativegeomap_p.h @@ -79,15 +79,18 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMap : public QQuickItem Q_PROPERTY(qreal maximumZoomLevel READ maximumZoomLevel WRITE setMaximumZoomLevel NOTIFY maximumZoomLevelChanged) Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) - Q_PROPERTY(bool bearingSupported READ isBearingSupported NOTIFY bearingSupportChanged) + Q_PROPERTY(bool tiltingSupported READ isTiltingSupported NOTIFY tiltingSupportChanged) - Q_PROPERTY(qreal minimumTilt READ minimumTilt NOTIFY minimumTiltChanged) - Q_PROPERTY(qreal maximumTilt READ maximumTilt NOTIFY maximumTiltChanged) - Q_PROPERTY(qreal bearing READ bearing WRITE setBearing NOTIFY bearingChanged) Q_PROPERTY(qreal tilt READ tilt WRITE setTilt NOTIFY tiltChanged) + Q_PROPERTY(qreal minimumTilt READ minimumTilt WRITE setMinimumTilt NOTIFY minimumTiltChanged) + Q_PROPERTY(qreal maximumTilt READ maximumTilt WRITE setMaximumTilt NOTIFY maximumTiltChanged) + + Q_PROPERTY(bool bearingSupported READ isBearingSupported NOTIFY bearingSupportChanged) + Q_PROPERTY(qreal bearing READ bearing WRITE setBearing NOTIFY bearingChanged) + Q_PROPERTY(qreal fieldOfView READ fieldOfView WRITE setFieldOfView NOTIFY fieldOfViewChanged) - Q_PROPERTY(qreal minimumFieldOfView READ minimumFieldOfView NOTIFY minimumFieldOfViewChanged) - Q_PROPERTY(qreal maximumFieldOfView READ maximumFieldOfView NOTIFY minimumFieldOfViewChanged) + Q_PROPERTY(qreal minimumFieldOfView READ minimumFieldOfView WRITE setMinimumFieldOfView NOTIFY minimumFieldOfViewChanged) + Q_PROPERTY(qreal maximumFieldOfView READ maximumFieldOfView WRITE setMaximumFieldOfView NOTIFY minimumFieldOfViewChanged) Q_PROPERTY(QDeclarativeGeoMapType *activeMapType READ activeMapType WRITE setActiveMapType NOTIFY activeMapTypeChanged) Q_PROPERTY(QQmlListProperty<QDeclarativeGeoMapType> supportedMapTypes READ supportedMapTypes NOTIFY supportedMapTypesChanged) @@ -121,22 +124,25 @@ public: void setZoomLevel(qreal zoomLevel); qreal zoomLevel() const; + bool isBearingSupported() const; void setBearing(qreal bearing); qreal bearing() const; + bool isTiltingSupported() const; void setTilt(qreal tilt); qreal tilt() const; + void setMinimumTilt(qreal minimumTilt, bool userSet = true); + qreal minimumTilt() const; + void setMaximumTilt(qreal maximumTilt, bool userSet = true); + qreal maximumTilt() const; void setFieldOfView(qreal fieldOfView); qreal fieldOfView() const; + void setMinimumFieldOfView(qreal minimumFieldOfView, bool userSet = true); qreal minimumFieldOfView() const; + void setMaximumFieldOfView(qreal maximumFieldOfView, bool userSet = true); qreal maximumFieldOfView() const; - bool isBearingSupported() const; - bool isTiltingSupported() const; - qreal minimumTilt() const; - qreal maximumTilt() const; - void setCenter(const QGeoCoordinate ¢er); QGeoCoordinate center() const; @@ -264,6 +270,16 @@ private: qreal m_userMinimumZoomLevel; qreal m_userMaximumZoomLevel; + qreal m_minimumTilt; + qreal m_maximumTilt; + qreal m_userMinimumTilt; + qreal m_userMaximumTilt; + + qreal m_minimumFieldOfView; + qreal m_maximumFieldOfView; + qreal m_userMinimumFieldOfView; + qreal m_userMaximumFieldOfView; + friend class QDeclarativeGeoMapItem; friend class QDeclarativeGeoMapItemView; friend class QQuickGeoMapGestureArea; |