diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-03-01 16:24:40 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-03-17 06:56:11 +0000 |
| commit | de165175549642c7fefa901d41ee96ef0702879c (patch) | |
| tree | c89145289e0a7147870bef06bfb8755440837d10 /src/location/maps/qgeomap_p_p.h | |
| parent | 3d8da84e368f87386f14287b10fb6d08e3ce2b48 (diff) | |
| download | qtlocation-de165175549642c7fefa901d41ee96ef0702879c.tar.gz | |
Remove QGeoMapController from QGeoMap
Refactor code to use QGeoCameraData directly. All functionality related
to zoom, center boundary checks are now handled in QDeclaratvieGeoMap class.
This makes handling of center and zoomLevel properties much simpler and
less error prone, since camera data can not be modified along the
call stack. As result we avoid forwarding change signals back and forth:
* qgeodeclarativegeomap::setCenter -> qgeomapcontroller::setCenter
* qgeomapcontroller::setCenter -> qgeomap::setCameraData
* qgeomap::setCameraData -> qgeomacontroller::cameraDataChanged
* qgeomapcontroller::cameraDataChanged -> emit qdecalartivegeomap::centerChanged
Call always setCenter and setZoomLevel on qdeclarativegeomap
instance instead.
Introduce initialize() method to handle cases where map plugin is loaded
and scenegraph geometery is not yet set. This is required to correctly
handle new boundary checks to limit grey areas.
Change-Id: I6066cefd4a648dc76333dc241d1f261451a32e9c
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/location/maps/qgeomap_p_p.h')
| -rw-r--r-- | src/location/maps/qgeomap_p_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h index 1d1c9a13..3b996ecc 100644 --- a/src/location/maps/qgeomap_p_p.h +++ b/src/location/maps/qgeomap_p_p.h @@ -77,7 +77,6 @@ protected: int m_width; int m_height; double m_aspectRatio; - double m_minimumZoom; QPointer<QGeoMappingManagerEngine> m_engine; QGeoMapController *m_controller; QGeoCameraData m_cameraData; |