From e1f62940d9db84744a0a93db83d76f6505eac590 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 4 Aug 2023 10:07:46 +1000 Subject: [PATCH] Remove QgsTiledMeshNode from public api --- .../tiledmesh/qgstiledmeshnode.sip.in | 69 ------------------- python/core/core_auto.sip | 1 - src/core/tiledmesh/qgstiledmeshnode.h | 6 +- tests/src/python/CMakeLists.txt | 1 - tests/src/python/test_qgstiledmeshnode.py | 50 -------------- 5 files changed, 4 insertions(+), 123 deletions(-) delete mode 100644 python/core/auto_generated/tiledmesh/qgstiledmeshnode.sip.in delete mode 100644 tests/src/python/test_qgstiledmeshnode.py diff --git a/python/core/auto_generated/tiledmesh/qgstiledmeshnode.sip.in b/python/core/auto_generated/tiledmesh/qgstiledmeshnode.sip.in deleted file mode 100644 index 13a95df9bbb..00000000000 --- a/python/core/auto_generated/tiledmesh/qgstiledmeshnode.sip.in +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************ - * This file has been generated automatically from * - * * - * src/core/tiledmesh/qgstiledmeshnode.h * - * * - * Do not edit manually ! Edit header and run scripts/sipify.pl again * - ************************************************************************/ - - - - - -class QgsTiledMeshNode -{ -%Docstring(signature="appended") -Allows representing :py:class:`QgsTiledMeshTiles` in a hierarchical tree. - -.. versionadded:: 3.34 -%End - -%TypeHeaderCode -#include "qgstiledmeshnode.h" -%End - public: - - QgsTiledMeshNode( QgsTiledMeshTile *tile /Transfer/ ); -%Docstring -Constructor for QgsTiledMeshNode, for the specified ``tile``. - -Ownership of ``tile`` is transferred to the node. -%End - - - ~QgsTiledMeshNode(); - - QgsTiledMeshTile *tile(); -%Docstring -Returns the tile associated with the node. -%End - - void addChild( QgsTiledMeshNode *child /Transfer/ ); -%Docstring -Adds a ``child`` to this node. - -Ownership of ``child`` is transferred to this node, and the parent for ``child`` will -automatically be set to this node. -%End - - QgsTiledMeshNode *parentNode() const; -%Docstring -Returns the parent of this node. -%End - - QList< QgsTiledMeshNode * > children() const; -%Docstring -Returns this node's children. -%End - - private: - QgsTiledMeshNode( const QgsTiledMeshNode &other ); -}; - -/************************************************************************ - * This file has been generated automatically from * - * * - * src/core/tiledmesh/qgstiledmeshnode.h * - * * - * Do not edit manually ! Edit header and run scripts/sipify.pl again * - ************************************************************************/ diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip index 6b69974113d..cf68556c4c7 100644 --- a/python/core/core_auto.sip +++ b/python/core/core_auto.sip @@ -717,7 +717,6 @@ %Include auto_generated/tiledmesh/qgstiledmeshdataprovider.sip %Include auto_generated/tiledmesh/qgstiledmeshindex.sip %Include auto_generated/tiledmesh/qgstiledmeshlayer.sip -%Include auto_generated/tiledmesh/qgstiledmeshnode.sip %Include auto_generated/tiledmesh/qgstiledmeshrequest.sip %Include auto_generated/tiledmesh/qgstiledmeshtile.sip %Include auto_generated/sensor/qgssensormodel.sip diff --git a/src/core/tiledmesh/qgstiledmeshnode.h b/src/core/tiledmesh/qgstiledmeshnode.h index aadbd2b444e..515499bc6c5 100644 --- a/src/core/tiledmesh/qgstiledmeshnode.h +++ b/src/core/tiledmesh/qgstiledmeshnode.h @@ -19,18 +19,20 @@ #ifndef QGSTILEDMESHNODE_H #define QGSTILEDMESHNODE_H -#include "qgis_core.h" #include "qgis.h" +#define SIP_NO_FILE + class QgsTiledMeshTile; /** * \ingroup core * \brief Allows representing QgsTiledMeshTiles in a hierarchical tree. * + * \note Not available in Python bindings * \since QGIS 3.34 */ -class CORE_EXPORT QgsTiledMeshNode +class QgsTiledMeshNode { public: diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt index b2da42689b1..c9ed0358caa 100644 --- a/tests/src/python/CMakeLists.txt +++ b/tests/src/python/CMakeLists.txt @@ -396,7 +396,6 @@ ADD_PYTHON_TEST(PyQgsTextFragment test_qgstextfragment.py) ADD_PYTHON_TEST(PyQgsTextFormatWidget test_qgstextformatwidget.py) ADD_PYTHON_TEST(PyQgsTiledMeshBoundingVolume test_qgstiledmeshboundingvolume.py) ADD_PYTHON_TEST(PyQgsTiledMeshLayer test_qgstiledmeshlayer.py) -ADD_PYTHON_TEST(PyQgsTiledMeshNode test_qgstiledmeshnode.py) ADD_PYTHON_TEST(PyQgsTiledMeshRequest test_qgstiledmeshrequest.py) ADD_PYTHON_TEST(PyQgsTiledMeshTile test_qgstiledmeshtile.py) ADD_PYTHON_TEST(PyQgsTiles test_qgstiles.py) diff --git a/tests/src/python/test_qgstiledmeshnode.py b/tests/src/python/test_qgstiledmeshnode.py deleted file mode 100644 index 46ececb980b..00000000000 --- a/tests/src/python/test_qgstiledmeshnode.py +++ /dev/null @@ -1,50 +0,0 @@ -"""QGIS Unit tests for QgsTiledMeshNode - -From build dir, run: ctest -R QgsTiledMeshNode -V - -.. note:: This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. -""" -__author__ = "(C) 2023 by Nyall Dawson" -__date__ = "26/07/2023" -__copyright__ = "Copyright 2023, The QGIS Project" - -import unittest - -from qgis.core import ( - QgsTiledMeshNode, - QgsTiledMeshTile, -) -from qgis.testing import start_app, QgisTestCase - -from utilities import unitTestDataPath - -start_app() -TEST_DATA_DIR = unitTestDataPath() - - -class TestQgsTiledMeshNode(QgisTestCase): - def test_basic(self): - tile = QgsTiledMeshTile("my tile") - node = QgsTiledMeshNode(tile) - self.assertEqual(node.tile().id(), "my tile") - - def test_children(self): - node = QgsTiledMeshNode(QgsTiledMeshTile("parent")) - self.assertFalse(node.children()) - - child_node = QgsTiledMeshNode(QgsTiledMeshTile("child")) - node.addChild(child_node) - self.assertEqual(node.children(), [child_node]) - self.assertEqual(child_node.parentNode(), node) - - child_node2 = QgsTiledMeshNode(QgsTiledMeshTile("child2")) - node.addChild(child_node2) - self.assertEqual(node.children(), [child_node, child_node2]) - self.assertEqual(child_node2.parentNode(), node) - - -if __name__ == "__main__": - unittest.main()