#include <QDebug>
#include <QMouseEvent>
+#include <QParallelAnimationGroup>
+#include "coordinates/scenecoordinate.h"
#include "mapcommon.h"
#include "mapscroller.h"
+#include "ui/panelcommon.h"
#include "mapview.h"
// const values for tuning the kinetic scroll effect
const int KINETIC_MIN_DRAG_LENGTH_VIEW_PIXELS = 30;
const int KINETIC_MAX_TIME_FROM_LAST_MOUSE_EVENT_MS = 100;
+const qreal KINETIC_MAX_VIEW_DISTANCE_FACTOR = 0.8;
const int KINETIC_SCROLL_TIME_MS = 750;
const qreal KINETIC_SPEED_TO_DISTANCE_FACTOR = 0.15 * sqrt(KINETIC_SCROLL_TIME_MS / MS_PER_S);
+const qreal ZOOM_TIME_MS = 350; ///< Length of the zoom effect (ms)
+
MapView::MapView(QWidget *parent)
- : QGraphicsView(parent)
+ : QGraphicsView(parent),
+ m_doubleTapZoomRunning(false)
{
qDebug() << __PRETTY_FUNCTION__;
m_zoomAnimation = new QPropertyAnimation(this, "viewScale", this);
connect(m_zoomAnimation, SIGNAL(finished()),
this, SIGNAL(viewZoomFinished()));
-
setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing);
m_scroller = &MapScroller::getInstance();
+
+ m_scrollAndZoomAnimation = new QParallelAnimationGroup();
+ m_scrollAndZoomAnimation->addAnimation(m_scroller);
+ m_scrollAndZoomAnimation->addAnimation(m_zoomAnimation);
+ connect(m_scrollAndZoomAnimation, SIGNAL(finished()),
+ this, SLOT(doubleTapZoomFinished()));
+
+ m_centerShiftAnimation = new QPropertyAnimation(this, "viewShift", this);
+ if (m_centerShiftAnimation) {
+ m_centerShiftAnimation->setStartValue(0.0);
+ m_centerShiftAnimation->setDuration(ZOOM_TIME_MS);
+ }
+}
+
+MapView::~MapView()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_scrollAndZoomAnimation->removeAnimation(m_scroller);
+ delete m_scrollAndZoomAnimation;
+}
+
+QPointF MapView::center() const
+{
+ return mapToScene(m_viewCenterPoint) - m_centerHorizontalShiftPoint;
+}
+
+void MapView::centerToSceneCoordinates(const SceneCoordinate &coordinate)
+{
+ qDebug() << __PRETTY_FUNCTION__ << "coordinate" << coordinate;
+
+ QPointF target = coordinate.toPointF();
+ m_lastSetScenePosition = coordinate;
+
+ target += m_centerHorizontalShiftPoint;
+
+ centerOn(target);
+}
+
+void MapView::disableCenterShift()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ if (m_centerShiftAnimation) {
+ m_centerShiftAnimation->setDirection(QAbstractAnimation::Backward);
+ m_centerShiftAnimation->start();
+ }
+}
+
+void MapView::doubleTapZoomFinished()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_doubleTapZoomRunning = false;
+ emit zoomIn();
+}
+
+void MapView::enableCenterShift()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ if (m_centerShiftAnimation) {
+ m_centerShiftAnimation->setDirection(QAbstractAnimation::Forward);
+ m_centerShiftAnimation->start();
+ }
}
-void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
+void MapView::mouseDoubleClickEvent(QMouseEvent *event)
{
- qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+ qDebug() << __PRETTY_FUNCTION__;
+
+ if (m_zoomLevel + 1 <= OSM_MAX_ZOOM_LEVEL) {
+ QPoint pressPosition = mapToScene(event->pos()).toPoint();
+ QPoint viewCenterPosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
+ QPoint zoomPosition = viewCenterPosition - ((viewCenterPosition - pressPosition) / 2)
+ - m_centerHorizontalShiftPoint.toPoint() / 2;
+
+ m_scrollAndZoomAnimation->stop();
+ m_doubleTapZoomRunning = true;
- centerOn(sceneCoordinate);
+ m_scroller->setEasingCurve(QEasingCurve::Linear);
+ m_scroller->setDuration(ZOOM_TIME_MS);
+ QPointF centerPoint = center();
+ m_scroller->setStartValue(SceneCoordinate(centerPoint.x(), centerPoint.y()));
+ m_scroller->setEndValue(SceneCoordinate(zoomPosition.x(), zoomPosition.y()));
+
+ m_zoomAnimation->setEasingCurve(QEasingCurve::InQuad);
+ m_zoomAnimation->setDuration(ZOOM_TIME_MS);
+ m_zoomAnimation->setStartValue(viewScale());
+ m_zoomAnimation->setEndValue(pow(2, m_zoomLevel + 1 - OSM_MAX_ZOOM_LEVEL));
+
+ m_scrollAndZoomAnimation->start();
+ }
}
void MapView::mouseMoveEvent(QMouseEvent *event)
{
- m_scenePosition += m_mouseLastScenePosition - mapToScene(event->pos()).toPoint();
+ qDebug() << __PRETTY_FUNCTION__;
+
+ if (m_doubleTapZoomRunning)
+ return;
- qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
+ m_internalScenePosition += m_lastMouseEventScenePosition - mapToScene(event->pos()).toPoint();
if (m_index >= VALUES)
m_index = 0;
- m_dragMovement[m_index] = m_mouseLastViewPosition - event->pos();
+ m_dragMovement[m_index] = m_lastMouseEventViewPosition - event->pos();
m_dragTime[m_index] = m_time.elapsed();
m_time.start();
m_index++;
- emit viewScrolled(m_scenePosition);
+ QPointF viewCenterPoint = m_internalScenePosition - m_centerHorizontalShiftPoint;
- m_mouseLastScenePosition = mapToScene(event->pos()).toPoint();
- m_mouseLastViewPosition = event->pos();
+ emit viewScrolled(SceneCoordinate(viewCenterPoint.x(), viewCenterPoint.y()));
+
+ m_lastMouseEventScenePosition = mapToScene(event->pos()).toPoint();
+ m_lastMouseEventViewPosition = event->pos();
}
void MapView::mousePressEvent(QMouseEvent *event)
{
qDebug() << __PRETTY_FUNCTION__;
+ if (m_doubleTapZoomRunning)
+ return;
+
m_time.start();
m_scroller->stop();
QGraphicsView::mousePressEvent(event);
- m_mouseLastScenePosition = mapToScene(event->pos()).toPoint();
- m_mouseLastViewPosition = event->pos();
- m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
+ m_lastMouseEventScenePosition = mapToScene(event->pos()).toPoint();
+ m_lastMouseEventViewPosition = event->pos();
+ m_internalScenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
for (int i = 0; i < VALUES; i++) {
m_dragMovement[i] = QPoint();
{
qDebug() << __PRETTY_FUNCTION__;
+ if (m_doubleTapZoomRunning)
+ return;
+
int elapsed = m_time.elapsed();
QGraphicsView::mouseReleaseEvent(event);
if (dragLength >= KINETIC_MIN_DRAG_LENGTH_VIEW_PIXELS) {
dragViewSpeed /= values;
- QPointF effectViewDistance= dragViewSpeed * KINETIC_SPEED_TO_DISTANCE_FACTOR;
+ QPointF effectViewDistance = dragViewSpeed * KINETIC_SPEED_TO_DISTANCE_FACTOR;
+
+ // limit the scroll distance in screen pixels
+ qreal biggerDistance = qMax(abs(effectViewDistance.x()), abs(effectViewDistance.y()));
+ if (biggerDistance > m_kineticMaxViewDistance)
+ effectViewDistance /= biggerDistance / m_kineticMaxViewDistance;
+
QPointF effectSceneDistance = effectViewDistance
- * (1 << (MAX_MAP_ZOOM_LEVEL - m_zoomLevel));
+ * (1 << (OSM_MAX_ZOOM_LEVEL - m_zoomLevel));
m_scroller->setEasingCurve(QEasingCurve::OutCirc);
m_scroller->setDuration(KINETIC_SCROLL_TIME_MS);
- m_scroller->setStartValue(m_scenePosition);
- m_scroller->setEndValue(m_scenePosition + effectSceneDistance.toPoint());
+ QPointF centerPoint = center();
+ m_scroller->setStartValue(SceneCoordinate(centerPoint.x(), centerPoint.y()));
+ QPointF endValue = centerPoint + effectSceneDistance;
+ m_scroller->setEndValue(SceneCoordinate(endValue.x(), endValue.y()));
m_scroller->start();
}
}
{
qDebug() << __PRETTY_FUNCTION__ << "Resize:" << event->size();
+ m_kineticMaxViewDistance = qMax(width(), height()) * KINETIC_MAX_VIEW_DISTANCE_FACTOR;
+
+ m_viewCenterPoint.setX(event->size().width() / 2);
+ m_viewCenterPoint.setY(event->size().height() / 2);
+
emit viewResized(event->size());
+
+ if (m_centerShiftAnimation) {
+ int mapVisibleWidth = event->size().width() - PANEL_WIDTH - PANEL_BAR_WIDTH;
+ int shiftFromMiddle = m_viewCenterPoint.x() - (mapVisibleWidth / 2);
+ m_centerShiftAnimation->setEndValue(shiftFromMiddle);
+ updateCenterShift();
+ }
}
void MapView::setViewScale(qreal viewScale)
QTransform transform;
transform.scale(viewScale, viewScale);
setTransform(transform);
+
+ updateCenterShift();
+}
+
+void MapView::setViewShift(qreal viewShift)
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_centerHorizontalShiftViewPixels = viewShift;
+ emit horizontalShiftingChanged(m_centerHorizontalShiftViewPixels);
+
+ updateCenterShift();
}
void MapView::setZoomLevel(int zoomLevel)
if (m_zoomAnimation) {
m_zoomAnimation->stop();
- m_zoomAnimation->setDuration(ZOOM_TIME);
+ m_zoomAnimation->setEasingCurve(QEasingCurve::InQuad);
+ m_zoomAnimation->setDuration(ZOOM_TIME_MS);
m_zoomAnimation->setStartValue(viewScale());
- m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
+ m_zoomAnimation->setEndValue(pow(2, zoomLevel - OSM_MAX_ZOOM_LEVEL));
m_zoomAnimation->start();
}
}
-qreal MapView::viewScale()
+void MapView::updateCenterShift()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_centerHorizontalShiftPoint = QPointF(m_centerHorizontalShiftViewPixels * (1.0 / viewScale()),
+ 0);
+
+ centerToSceneCoordinates(m_lastSetScenePosition);
+}
+
+qreal MapView::viewScale() const
{
qDebug() << __PRETTY_FUNCTION__;
return transform().m11();
}
+
+qreal MapView::viewShift() const
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ return m_centerHorizontalShiftViewPixels;
+}
projects / situare / blobdiff