diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-01-18 13:22:37 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-20 20:55:51 +0300 |
| commit | f83b8d8ea4631aa063d04e3194a84c75ba667dfd (patch) | |
| tree | 9b61fcd0636b1bbadd954d2154309a5d1c16da1d /platform/qt/src | |
| parent | 7d863d259ae4d2f8a55a211c428a1ff11ae529f1 (diff) | |
| download | qtlocation-mapboxgl-f83b8d8ea4631aa063d04e3194a84c75ba667dfd.tar.gz | |
[Qt] Do not use Mapbox GL animations
Let animations to QPropertyAnimation so it can sync with other
Qt animations and let the user define the easing curve Qt-style.
Diffstat (limited to 'platform/qt/src')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index c9bc863000..12b36dd97a 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -163,9 +163,9 @@ double QMapboxGL::scale() const return d_ptr->mapObj->getScale(); } -void QMapboxGL::setScale(double scale_, const QPointF ¢er, int milliseconds) +void QMapboxGL::setScale(double scale_, const QPointF ¢er) { - d_ptr->mapObj->setScale(scale_, mbgl::ScreenCoordinate{ center.x(), center.y() }, std::chrono::milliseconds(milliseconds)); + d_ptr->mapObj->setScale(scale_, mbgl::ScreenCoordinate { center.x(), center.y() }); } double QMapboxGL::zoom() const @@ -173,9 +173,9 @@ double QMapboxGL::zoom() const return d_ptr->mapObj->getZoom(); } -void QMapboxGL::setZoom(double zoom_, int milliseconds) +void QMapboxGL::setZoom(double zoom_) { - d_ptr->mapObj->setZoom(zoom_, std::chrono::milliseconds(milliseconds)); + d_ptr->mapObj->setZoom(zoom_); } double QMapboxGL::minimumZoom() const @@ -194,18 +194,14 @@ QMapboxGL::Coordinate QMapboxGL::coordinate() const return Coordinate(latLng.latitude, latLng.longitude); } -void QMapboxGL::setCoordinate(const Coordinate &coordinate_, int milliseconds) +void QMapboxGL::setCoordinate(const Coordinate &coordinate_) { - d_ptr->mapObj->setLatLng( - mbgl::LatLng { coordinate_.first, coordinate_.second }, - mbgl::Duration(std::chrono::milliseconds(milliseconds))); + d_ptr->mapObj->setLatLng(mbgl::LatLng { coordinate_.first, coordinate_.second }); } -void QMapboxGL::setCoordinateZoom(const Coordinate &coordinate_, double zoom_, int milliseconds) +void QMapboxGL::setCoordinateZoom(const Coordinate &coordinate_, double zoom_) { - d_ptr->mapObj->setLatLngZoom( - mbgl::LatLng { coordinate_.first, coordinate_.second }, zoom_, - std::chrono::milliseconds(milliseconds)); + d_ptr->mapObj->setLatLngZoom(mbgl::LatLng { coordinate_.first, coordinate_.second }, zoom_); } double QMapboxGL::bearing() const @@ -213,9 +209,9 @@ double QMapboxGL::bearing() const return d_ptr->mapObj->getBearing(); } -void QMapboxGL::setBearing(double degrees, int milliseconds) +void QMapboxGL::setBearing(double degrees) { - d_ptr->mapObj->setBearing(degrees, mbgl::Duration(std::chrono::milliseconds(milliseconds))); + d_ptr->mapObj->setBearing(degrees); } void QMapboxGL::setBearing(double degrees, const QPointF ¢er) @@ -228,9 +224,9 @@ double QMapboxGL::pitch() const return d_ptr->mapObj->getPitch(); } -void QMapboxGL::setPitch(double pitch_, int milliseconds) +void QMapboxGL::setPitch(double pitch_) { - d_ptr->mapObj->setPitch(pitch_, std::chrono::milliseconds(milliseconds)); + d_ptr->mapObj->setPitch(pitch_); } QMapboxGL::NorthOrientation QMapboxGL::northOrientation() const @@ -410,10 +406,8 @@ void QMapboxGL::moveBy(const QPointF &offset) d_ptr->mapObj->moveBy(mbgl::ScreenCoordinate { offset.x(), offset.y() }); } -void QMapboxGL::scaleBy(double scale_, const QPointF ¢er, int milliseconds) { - d_ptr->mapObj->scaleBy( - scale_, mbgl::ScreenCoordinate { center.x(), center.y() }, - std::chrono::milliseconds(milliseconds)); +void QMapboxGL::scaleBy(double scale_, const QPointF ¢er) { + d_ptr->mapObj->scaleBy(scale_, mbgl::ScreenCoordinate { center.x(), center.y() }); } void QMapboxGL::rotateBy(const QPointF &first, const QPointF &second) |