tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Qt] Added QQuickMapboxGLStyle

Browse Source 
A QQuickMapboxGLStyleProperty being a child of QQuickMapboxGLStyle
assures that only properties associated with that particular style will
reflect on the map - and that happens only when the style is the current
set via style property.
This commit is contained in:
Bruno de Oliveira Abinader
2016-08-05 16:32:31 +03:00
parent 45da1abbe1
commit 8843bebee2
9 changed files with 161 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/qt/include/QQuickMapboxGLStyle Normal file
View File

@@ -0,0 +1 @@
#include "qquickmapboxglstyle.hpp"

11
platform/qt/include/qquickmapboxgl.hpp
View File

@@ -8,6 +8,8 @@
#include <QPointF>
#include <QQuickFramebufferObject>
#include <QQuickMapboxGLStyle>
class QDeclarativeGeoServiceProvider;
class QQuickItem;
@@ -29,7 +31,7 @@ class Q_DECL_EXPORT QQuickMapboxGL : public QQuickFramebufferObject
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
// MapboxGL QML Type interface.
Q_PROPERTY(QString style READ style WRITE setStyle NOTIFY styleChanged)
Q_PROPERTY(QQuickMapboxGLStyle *style READ style WRITE setStyle NOTIFY styleChanged)
Q_PROPERTY(qreal bearing READ bearing WRITE setBearing NOTIFY bearingChanged)
Q_PROPERTY(qreal pitch READ pitch WRITE setPitch NOTIFY pitchChanged)
@@ -73,8 +75,8 @@ public:
QList<QVariantMap>& paintPropertyChanges() { return m_paintChanges; }
// MapboxGL QML Type interface.
void setStyle(const QString &style);
QString style() const;
void setStyle(QQuickMapboxGLStyle *);
QQuickMapboxGLStyle* style() const;
void setBearing(qreal bearing);
qreal bearing() const;
@@ -121,6 +123,7 @@ public slots:
void setCenter(const QGeoCoordinate &center);
private slots:
void onStyleChanged();
void onStylePropertyUpdated(const QVariantMap &params);
private:
@@ -136,7 +139,7 @@ private:
QList<QVariantMap> m_layoutChanges;
QList<QVariantMap> m_paintChanges;
QString m_style;
QQuickMapboxGLStyle *m_style = 0;
qreal m_bearing = 0;
qreal m_pitch = 0;

39
platform/qt/include/qquickmapboxglstyle.hpp Normal file
View File

@@ -0,0 +1,39 @@
#ifndef QQUICKMAPBOXGLSTYLE_H
#define QQUICKMAPBOXGLSTYLE_H
#include <QQuickItem>
class Q_DECL_EXPORT QQuickMapboxGLStyle : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
Q_PROPERTY(QString styleClass READ styleClass WRITE setStyleClass NOTIFY classChanged)
public:
QQuickMapboxGLStyle(QQuickItem *parent = Q_NULLPTR);
virtual ~QQuickMapboxGLStyle() {}
// QQuickItem implementation
virtual void itemChange(QQuickItem::ItemChange, const QQuickItem::ItemChangeData &);
void setUrl(const QString &);
QString url() const;
void setStyleClass(const QString &);
QString styleClass() const;
signals:
void urlChanged(const QString &);
void classChanged(const QString &);
void propertyUpdated(const QVariantMap &);
private:
QString m_url;
QString m_class;
};
QML_DECLARE_TYPE(QQuickMapboxGLStyle)
#endif // QQUICKMAPBOXGLSTYLE_H

2
platform/qt/qmlapp/main.cpp
View File

@@ -4,6 +4,7 @@
#include <qqml.h>
#include <QQuickMapboxGL>
#include <QQuickMapboxGLStyle>
#include <QQuickMapboxGLStyleProperty>
int main(int argc, char *argv[])
@@ -15,6 +16,7 @@ int main(int argc, char *argv[])
#endif
qmlRegisterType<QQuickMapboxGL>("QQuickMapboxGL", 1, 0, "MapboxMap");
qmlRegisterType<QQuickMapboxGLStyle>("QQuickMapboxGL", 1, 0, "MapboxStyle");
qmlRegisterType<QQuickMapboxGLLayoutStyleProperty>("QQuickMapboxGL", 1, 0, "MapboxLayoutStyleProperty");
qmlRegisterType<QQuickMapboxGLPaintStyleProperty>("QQuickMapboxGL", 1, 0, "MapboxPaintStyleProperty");

50
platform/qt/qmlapp/main.qml
View File

@@ -16,7 +16,7 @@ ApplicationWindow {
ColorDialog {
id: landColorDialog
title: "Land color"
onCurrentColorChanged: { mapStreets.color = currentColor }
onCurrentColorChanged: { mapFront.color = currentColor }
}
ColorDialog {
@@ -26,21 +26,21 @@ ApplicationWindow {
}
MapboxLayoutStyleProperty {
parent: mapStreets
parent: styleStreets
layer: "road-label-large"
property: "visibility"
value: roadLabel.checked ? "visible" : "none"
}
MapboxLayoutStyleProperty {
parent: mapStreets
parent: styleStreets
layer: "road-label-medium"
property: "visibility"
value: roadLabel.checked ? "visible" : "none"
}
MapboxLayoutStyleProperty {
parent: mapStreets
parent: styleStreets
layer: "road-label-small"
property: "visibility"
value: roadLabel.checked ? "visible" : "none"
@@ -70,12 +70,15 @@ ApplicationWindow {
anchors.fill: parent
MapboxMap {
id: mapStreets
id: mapFront
anchors.fill: parent
visible: false
style: "mapbox://styles/mapbox/streets-v9"
style: MapboxStyle {
id: styleStreets
url: "mapbox://styles/mapbox/streets-v9"
}
center: QtPositioning.coordinate(60.170448, 24.942046) // Helsinki
zoomLevel: 14
@@ -124,7 +127,7 @@ ApplicationWindow {
OpacityMask {
anchors.fill: maskStreets
source: mapStreets
source: mapFront
maskSource: maskStreets
}
@@ -134,7 +137,7 @@ ApplicationWindow {
property var lastX: 0
property var lastY: 0
onWheel: mapStreets.zoomLevel += 0.2 * wheel.angleDelta.y / 120
onWheel: mapFront.zoomLevel += 0.2 * wheel.angleDelta.y / 120
onPressed: {
lastX = mouse.x
@@ -142,7 +145,7 @@ ApplicationWindow {
}
onPositionChanged: {
mapStreets.pan(mouse.x - lastX, mouse.y - lastY)
mapFront.pan(mouse.x - lastX, mouse.y - lastY)
lastX = mouse.x
lastY = mouse.y
@@ -154,20 +157,23 @@ ApplicationWindow {
anchors.fill: parent
MapboxMap {
id: mapSatellite
id: mapBack
anchors.fill: parent
visible: false
style: "mapbox://styles/mapbox/satellite-streets-v9"
style: MapboxStyle {
id: styleSatellite
url: "mapbox://styles/mapbox/satellite-streets-v9"
}
center: mapStreets.center
zoomLevel: mapStreets.zoomLevel
minimumZoomLevel: mapStreets.minimumZoomLevel
maximumZoomLevel: mapStreets.maximumZoomLevel
center: mapFront.center
zoomLevel: mapFront.zoomLevel
minimumZoomLevel: mapFront.minimumZoomLevel
maximumZoomLevel: mapFront.maximumZoomLevel
bearing: mapStreets.bearing
pitch: mapStreets.pitch
bearing: mapFront.bearing
pitch: mapFront.pitch
Image {
anchors.right: parent.right
@@ -197,7 +203,7 @@ ApplicationWindow {
OpacityMask {
anchors.fill: maskSatellite
source: mapSatellite
source: mapBack
maskSource: maskSatellite
}
@@ -207,7 +213,7 @@ ApplicationWindow {
property var lastX: 0
property var lastY: 0
onWheel: mapStreets.zoomLevel += 0.2 * wheel.angleDelta.y / 120
onWheel: mapFront.zoomLevel += 0.2 * wheel.angleDelta.y / 120
onPressed: {
lastX = mouse.x
@@ -215,7 +221,7 @@ ApplicationWindow {
}
onPositionChanged: {
mapStreets.pan(mouse.x - lastX, mouse.y - lastY)
mapFront.pan(mouse.x - lastX, mouse.y - lastY)
lastX = mouse.x
lastY = mouse.y
@@ -281,14 +287,14 @@ ApplicationWindow {
anchors.left: parent.left
anchors.right: parent.right
text: "Light style"
onClicked: { mapStreets.style = "mapbox://styles/mapbox/light-v9" }
onClicked: { styleStreets.url = "mapbox://styles/mapbox/light-v9" }
}
Button {
anchors.left: parent.left
anchors.right: parent.right
text: "Dark style"
onClicked: { mapStreets.style = "mapbox://styles/mapbox/dark-v9" }
onClicked: { styleStreets.url = "mapbox://styles/mapbox/dark-v9" }
}
CheckBox {

2
platform/qt/qt5.cmake
View File

@@ -17,10 +17,12 @@ set(MBGL_QT_LIBRARIES
add_library(qmapboxgl SHARED
platform/qt/include/qquickmapboxgl.hpp
platform/qt/include/qquickmapboxglstyle.hpp
platform/qt/include/qquickmapboxglstyleproperty.hpp
platform/qt/src/qquickmapboxgl.cpp
platform/qt/src/qquickmapboxglrenderer.cpp
platform/qt/src/qquickmapboxglrenderer.hpp
platform/qt/src/qquickmapboxglstyle.cpp
platform/qt/src/qquickmapboxglstyleproperty.cpp
)

24
platform/qt/src/qquickmapboxgl.cpp
View File

@@ -182,13 +182,21 @@ void QQuickMapboxGL::pan(int dx, int dy)
update();
}
void QQuickMapboxGL::setStyle(const QString &styleUrl)
void QQuickMapboxGL::setStyle(QQuickMapboxGLStyle *style)
{
if (m_style == styleUrl) {
if (style == m_style) {
return;
}
m_style = styleUrl;
disconnect(style, SIGNAL(urlChanged(QString)), this, SLOT(onStyleChanged()));
disconnect(style, SIGNAL(propertyUpdated(QVariantMap)), this, SLOT(onStylePropertyUpdated(QVariantMap)));
delete m_style;
m_style = style;
if (style) {
style->setParentItem(this);
connect(style, SIGNAL(urlChanged(QString)), this, SLOT(onStyleChanged()));
connect(style, SIGNAL(propertyUpdated(QVariantMap)), this, SLOT(onStylePropertyUpdated(QVariantMap)));
}
m_syncState |= StyleNeedsSync;
update();
@@ -196,7 +204,7 @@ void QQuickMapboxGL::setStyle(const QString &styleUrl)
emit styleChanged();
}
QString QQuickMapboxGL::style() const
QQuickMapboxGLStyle *QQuickMapboxGL::style() const
{
return m_style;
}
@@ -295,3 +303,11 @@ void QQuickMapboxGL::onStylePropertyUpdated(const QVariantMap &params)
update();
}
void QQuickMapboxGL::onStyleChanged()
{
m_syncState |= StyleNeedsSync;
update();
emit styleChanged();
}

5
platform/qt/src/qquickmapboxglrenderer.cpp
View File

@@ -2,6 +2,7 @@
#include <QMapboxGL>
#include <QQuickMapboxGL>
#include <QQuickMapboxGLStyle>
#include <QSize>
#include <QOpenGLFramebufferObject>
@@ -83,8 +84,8 @@ void QQuickMapboxGLRenderer::synchronize(QQuickFramebufferObject *item)
m_map->setCoordinateZoom({ center.latitude(), center.longitude() }, quickMap->zoomLevel());
}
if (syncStatus & QQuickMapboxGL::StyleNeedsSync) {
m_map->setStyleURL(quickMap->style());
if (syncStatus & QQuickMapboxGL::StyleNeedsSync && quickMap->style()) {
m_map->setStyleURL(quickMap->style()->url());
m_styleLoaded = false;
}

59
platform/qt/src/qquickmapboxglstyle.cpp Normal file
View File

@@ -0,0 +1,59 @@
#include <QQuickMapboxGLStyle>
#include <QQuickMapboxGLStyleProperty>
QQuickMapboxGLStyle::QQuickMapboxGLStyle(QQuickItem *parent)
: QQuickItem(parent)
{
}
void QQuickMapboxGLStyle::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
{
QQuickItem::itemChange(change, value);
switch (change) {
case QQuickItem::ItemChildAddedChange:
if (QQuickMapboxGLStyleProperty *property = qobject_cast<QQuickMapboxGLStyleProperty *>(value.item)) {
connect(property, SIGNAL(updated(QVariantMap)), this, SIGNAL(propertyUpdated(QVariantMap)));
connect(this, SIGNAL(urlChanged(QString)), property, SLOT(checkUpdated()));
}
break;
case QQuickItem::ItemChildRemovedChange:
if (QQuickMapboxGLStyleProperty *property = qobject_cast<QQuickMapboxGLStyleProperty *>(value.item)) {
disconnect(property, SIGNAL(updated(QVariantMap)), this, SIGNAL(propertyUpdated(QVariantMap)));
disconnect(this, SIGNAL(urlChanged(QString)), property, SLOT(checkUpdated()));
}
break;
default:
break;
}
}
void QQuickMapboxGLStyle::setUrl(const QString &url)
{
if (url == m_url) {
return;
}
m_url = url;
emit urlChanged(url);
}
QString QQuickMapboxGLStyle::url() const
{
return m_url;
}
void QQuickMapboxGLStyle::setStyleClass(const QString &styleClass)
{
if (styleClass == m_class) {
return;
}
m_class = styleClass;
emit classChanged(styleClass);
}
QString QQuickMapboxGLStyle::styleClass() const
{
return m_class;
}