diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-21 12:31:47 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-26 22:24:50 +0200 |
commit | fdbbfa4a6723b816478ee011ab4098e5332dc2f5 (patch) | |
tree | 6e6d6a68f7edf0ec5ee85495d316d1ff34bbee71 /src/location/labs/qsg/qmapiconobjectqsg.cpp | |
parent | a94cefd446dd192172f47f183b56bbb719e95ee4 (diff) | |
download | qtlocation-fdbbfa4a6723b816478ee011ab4098e5332dc2f5.tar.gz |
Remove MapObjects from labs
The feature was designed to enable map backends to implement their own
rendering of the map, and map items. It was never really used by any of
the backends we supported, and introduced a lot of complexity to the
code base.
The idea as such has perhaps merit, but for now we focus on the basic
functionality of Qt Location. Support for Qt Location when the Qt
Quick scene graph is not used is not a part of that.
Change-Id: I08e460043a0bd2600bad79b6ce2bb18e40e19eb6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/location/labs/qsg/qmapiconobjectqsg.cpp')
-rw-r--r-- | src/location/labs/qsg/qmapiconobjectqsg.cpp | 226 |
1 files changed, 0 insertions, 226 deletions
diff --git a/src/location/labs/qsg/qmapiconobjectqsg.cpp b/src/location/labs/qsg/qmapiconobjectqsg.cpp deleted file mode 100644 index 9996866b..00000000 --- a/src/location/labs/qsg/qmapiconobjectqsg.cpp +++ /dev/null @@ -1,226 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtLocation module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qmapiconobjectqsg_p_p.h" -#include <QtQuick/qsgimagenode.h> -#include <QtQuick/qsgnode.h> -#include <QtQuick/qquickimageprovider.h> -#include <QtQuick/qquickwindow.h> -#include <QtQml/qqmlengine.h> -#include <QtQml/qqml.h> -#include <QtNetwork/qnetworkaccessmanager.h> -#include <QtLocation/private/qdeclarativepolylinemapitem_p.h> - -QT_BEGIN_NAMESPACE - -class RootNode : public QSGTransformNode, public VisibleNode -{ -public: - RootNode() { } - - bool isSubtreeBlocked() const override - { - return subtreeBlocked(); - } -}; - -QMapIconObjectPrivateQSG::QMapIconObjectPrivateQSG(QGeoMapObject *q) - : QMapIconObjectPrivateDefault(q) -{ - -} - -QMapIconObjectPrivateQSG::QMapIconObjectPrivateQSG(const QMapIconObjectPrivate &other) - : QMapIconObjectPrivateDefault(other) -{ - // Data already cloned by the *Default copy constructor, but necessary - // update operations triggered only by setters overrides - setContent(content()); -// setCoordinate(coordinate()); -} - -QMapIconObjectPrivateQSG::~QMapIconObjectPrivateQSG() -{ - if (m_map) - m_map->removeMapObject(q); -} - -void QMapIconObjectPrivateQSG::updateGeometry() -{ - if (!m_map) - return; - - m_geometryDirty = true; - const QGeoProjectionWebMercator &p = static_cast<const QGeoProjectionWebMercator&>(m_map->geoProjection()); - - m_itemPosition = p.coordinateToItemPosition(coordinate()); - if (m_itemPosition.isFinite()) { - m_transformation.setToIdentity(); - m_transformation.translate(QVector3D(m_itemPosition.x(), m_itemPosition.y(), 0)); - } - - // TODO: support and test for zoomLevel -} - -QSGNode *QMapIconObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode, - VisibleNode **visibleNode, - QSGNode *root, - QQuickWindow *window) -{ - Q_UNUSED(visibleNode); - RootNode *node = static_cast<RootNode *>(oldNode); - if (!node) { - node = new RootNode(); - m_imageNode = window->createImageNode(); - m_imageNode->setOwnsTexture(true); - node->appendChildNode(m_imageNode); - *visibleNode = static_cast<VisibleNode *>(node); - } - - if (m_imageDirty) { - m_imageDirty = false; - m_imageNode->setTexture(window->createTextureFromImage(m_image)); - QRect rect = m_image.rect(); - m_imageNode->setSourceRect(rect); - m_imageNode->setRect(QRectF(QPointF(0,0), iconSize())); - } - - if (m_geometryDirty) { - m_geometryDirty = false; - if (!m_itemPosition.isFinite()) { - node->setSubtreeBlocked(true); - } else { - node->setSubtreeBlocked(false); - node->setMatrix(m_transformation); - } - } - - root->appendChildNode(node); - - return node; -} - -void QMapIconObjectPrivateQSG::setCoordinate(const QGeoCoordinate &coordinate) -{ - QMapIconObjectPrivateDefault::setCoordinate(coordinate); - updateGeometry(); -} - -template<typename T> -static T *getContent(const QVariant &content) -{ - QObject *obj = qvariant_cast<QObject *>(content); - return qobject_cast<T *>(obj); -} - -static inline QString imageId(const QUrl &url) -{ - return url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1); -} - -void QMapIconObjectPrivateQSG::clearContent() -{ - m_image = QImage(); -} - -void QMapIconObjectPrivateQSG::setContent(const QVariant &content) -{ - // First reset all local containers - clearContent(); - QQmlEngine *engine = qmlEngine(q); - - // Then pull the new content - QMapIconObjectPrivateDefault::setContent(content); - switch (content.typeId()) { - case QMetaType::User: { - // TODO: Handle QObject subclasses -- first decide which ones - break; - } - case QMetaType::QString: - case QMetaType::QUrl: { - // URL, including image/texture providers - // Supporting only image providers for now - const QUrl url = content.toUrl(); - if (!url.isValid()) { - m_image = QImage(content.toString()); - m_imageDirty = true; - updateGeometry(); - } else if (url.scheme().isEmpty() || url.scheme() == QLatin1String("file")) { - m_image = QImage(url.toString(QUrl::RemoveScheme)); - m_imageDirty = true; - updateGeometry(); - } else if (url.scheme() == QLatin1String("image")) { - QQuickImageProvider *provider = static_cast<QQuickImageProvider *>(engine->imageProvider(url.host())); - QSize outSize; - m_image = provider->requestImage(imageId(url), &outSize, QSize()); - if (outSize.isEmpty()) - break; - m_imageDirty = true; - updateGeometry(); - } else { // ToDo: Use QNAM - - } - - break; - } - case QMetaType::QByteArray: { - // ToDo: Build the image from bytearray - break; - } - default: - qWarning() << "Unsupported parameter type: " << content.typeId(); - break; - } - - if (m_map && m_imageDirty) - emit m_map->sgNodeChanged(); -} - -void QMapIconObjectPrivateQSG::setIconSize(const QSizeF &size) -{ - QMapIconObjectPrivateDefault::setIconSize(size); - updateGeometry(); -} - -QGeoMapObjectPrivate *QMapIconObjectPrivateQSG::clone() -{ - return new QMapIconObjectPrivateQSG(static_cast<QMapIconObjectPrivate &>(*this)); -} - -QT_END_NAMESPACE |