diff options
| author | David Laing <david.laing@nokia.com> | 2012-02-14 10:49:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-16 09:29:51 +0100 |
| commit | fabea2739711a27f0b53f614476a098a5137a5a5 (patch) | |
| tree | 25fe0e4e6389a1df635beb3b893c1625f90d5f1f /src/location/maps/qgeomap.cpp | |
| parent | cdb80baa8386d11a0cbab8423ea956ae2393672f (diff) | |
| download | qtlocation-fabea2739711a27f0b53f614476a098a5137a5a5.tar.gz | |
Cleans up the QGeoCameraData class.
There were some fields that were unused or only used for
debugging the prototype of the library which are no longer needed.
This removes those fields and renames zoomFactor to zoomLevel -
"zoomLevel" is a better name for it, but we need the double type /
semantics of zoomFactor.
Change-Id: I32ba97ca1b4bccfe33b86c8eccd2c94b12079d2e
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/location/maps/qgeomap.cpp')
| -rw-r--r-- | src/location/maps/qgeomap.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp index 2cd424fc..84471d0f 100644 --- a/src/location/maps/qgeomap.cpp +++ b/src/location/maps/qgeomap.cpp @@ -278,11 +278,11 @@ void QGeoMapPrivate::setCameraData(const QGeoCameraData &cameraData) if (manager_) { QGeoCameraCapabilities capabilities = manager_->cameraCapabilities(); - if (cameraData_.zoomFactor() < capabilities.minimumZoomLevel()) - cameraData_.setZoomFactor(capabilities.minimumZoomLevel()); + if (cameraData_.zoomLevel() < capabilities.minimumZoomLevel()) + cameraData_.setZoomLevel(capabilities.minimumZoomLevel()); - if (cameraData_.zoomFactor() > capabilities.maximumZoomLevel()) - cameraData_.setZoomFactor(capabilities.maximumZoomLevel()); + if (cameraData_.zoomLevel() > capabilities.maximumZoomLevel()) + cameraData_.setZoomLevel(capabilities.maximumZoomLevel()); if (!capabilities.supportsBearing()) cameraData_.setBearing(0.0); @@ -301,7 +301,6 @@ void QGeoMapPrivate::setCameraData(const QGeoCameraData &cameraData) cameraData_.setRoll(0.0); } - cameraData_.setAspectRatio(aspectRatio_); cameraData_.setCoordinateInterpolator(mapGeometry_->coordinateInterpolator().toWeakRef()); cameraTiles_->setCamera(cameraData_); |