diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-06-09 14:37:52 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-06-23 12:42:51 +0000 |
commit | f5c6e2690a749cd1e33b49a1cb57ebfa94996da3 (patch) | |
tree | baa7e5969a6caf7e7dea77c61144a534cfdae9fb /src/imports/positioning/qquickgeocoordinateanimation_p.h | |
parent | 526fd8bd3d9ef112399d1cae6c0dfa094525d33e (diff) | |
download | qtlocation-f5c6e2690a749cd1e33b49a1cb57ebfa94996da3.tar.gz |
Add new types of interpolation to CoordinateAnimation
A longitude animation can go in two directions West and East.
Current implementation is always using the shortest
animation path between two coordinates. Provide
setting to overload this behavior.
Add 'direction' setting to CoordianteAnimation. Implement
two new interpolators and provide new private
implementation derived form qquickpropertyanimation.
Change-Id: Ida70780c8aef60ebea7a8b8d59f115c583430374
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/imports/positioning/qquickgeocoordinateanimation_p.h')
-rw-r--r-- | src/imports/positioning/qquickgeocoordinateanimation_p.h | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/src/imports/positioning/qquickgeocoordinateanimation_p.h b/src/imports/positioning/qquickgeocoordinateanimation_p.h new file mode 100644 index 00000000..8c93a0b0 --- /dev/null +++ b/src/imports/positioning/qquickgeocoordinateanimation_p.h @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKGEOCOORDINATEANIMATION_P_H +#define QQUICKGEOCOORDINATEANIMATION_P_H + +#include <QtQuick/private/qquickanimation_p.h> +#include <QtPositioning/qgeocoordinate.h> + +QT_BEGIN_NAMESPACE + +class QQuickGeoCoordinateAnimationPrivate; + +class QQuickGeoCoordinateAnimation : public QQuickPropertyAnimation +{ + Q_OBJECT + Q_DECLARE_PRIVATE(QQuickGeoCoordinateAnimation) + Q_PROPERTY(QGeoCoordinate from READ from WRITE setFrom) + Q_PROPERTY(QGeoCoordinate to READ to WRITE setTo) + Q_PROPERTY(Direction direction READ direction WRITE setDirection NOTIFY directionChanged) + +public: + enum Direction { + Shortest, + West, + East + }; + Q_ENUM(Direction) + + QQuickGeoCoordinateAnimation(QObject *parent=0); + ~QQuickGeoCoordinateAnimation(); + + QGeoCoordinate from() const; + void setFrom(const QGeoCoordinate &); + + QGeoCoordinate to() const; + void setTo(const QGeoCoordinate &); + + Direction direction() const; + void setDirection(Direction direction); + +Q_SIGNALS: + void directionChanged(); +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickGeoCoordinateAnimation) + +#endif // QQUICKCOORDINATEANIMATION_P_H |