From b3f4f7331bd3d57167c9279cfe8bb85d15f46850 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 9 Jan 2025 14:23:50 +0100 Subject: [PATCH] qgsvectorlayer.h: move a documentation section to the appropriate place Cf https://lists.osgeo.org/pipermail/qgis-developer/2025-January/067278.html --- .../auto_generated/vector/qgsvectorlayer.sip.in | 14 +++++++------- .../auto_generated/vector/qgsvectorlayer.sip.in | 14 +++++++------- src/core/vector/qgsvectorlayer.h | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/python/PyQt6/core/auto_generated/vector/qgsvectorlayer.sip.in b/python/PyQt6/core/auto_generated/vector/qgsvectorlayer.sip.in index 9be242ffdce1..c95e280092bc 100644 --- a/python/PyQt6/core/auto_generated/vector/qgsvectorlayer.sip.in +++ b/python/PyQt6/core/auto_generated/vector/qgsvectorlayer.sip.in @@ -144,6 +144,13 @@ attribute operators, “BBOX, Disjoint, Intersects, Touches, Crosses, Contains, spatial binary operators and the QGIS local “geomFromWKT, geomFromGML” geometry constructor functions. +Also note: + +- You can use various functions available in the QGIS Expression list, + however the function must exist server side and have the same name and arguments to work. +- Use the special $geometry parameter to provide the layer geometry column as input + into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)')) + OGC API Features data provider (oapif) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -163,13 +170,6 @@ The URI should be constructed using the :py:class:`QgsDataSourceUri` class with - maxNumFeatures=number: maximum number of features to retrieve (possibly across several multiple paging requests) - hideDownloadProgressDialog=1: to hide the download progress dialog. -Also note: - -- You can use various functions available in the QGIS Expression list, - however the function must exist server side and have the same name and arguments to work. -- Use the special $geometry parameter to provide the layer geometry column as input - into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)')) - Delimited text file data provider (delimitedtext) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/python/core/auto_generated/vector/qgsvectorlayer.sip.in b/python/core/auto_generated/vector/qgsvectorlayer.sip.in index b442d74e7925..d1ca32270811 100644 --- a/python/core/auto_generated/vector/qgsvectorlayer.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayer.sip.in @@ -144,6 +144,13 @@ attribute operators, “BBOX, Disjoint, Intersects, Touches, Crosses, Contains, spatial binary operators and the QGIS local “geomFromWKT, geomFromGML” geometry constructor functions. +Also note: + +- You can use various functions available in the QGIS Expression list, + however the function must exist server side and have the same name and arguments to work. +- Use the special $geometry parameter to provide the layer geometry column as input + into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)')) + OGC API Features data provider (oapif) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -163,13 +170,6 @@ The URI should be constructed using the :py:class:`QgsDataSourceUri` class with - maxNumFeatures=number: maximum number of features to retrieve (possibly across several multiple paging requests) - hideDownloadProgressDialog=1: to hide the download progress dialog. -Also note: - -- You can use various functions available in the QGIS Expression list, - however the function must exist server side and have the same name and arguments to work. -- Use the special $geometry parameter to provide the layer geometry column as input - into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)')) - Delimited text file data provider (delimitedtext) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/core/vector/qgsvectorlayer.h b/src/core/vector/qgsvectorlayer.h index 59403a9bb97c..76a67304a8b6 100644 --- a/src/core/vector/qgsvectorlayer.h +++ b/src/core/vector/qgsvectorlayer.h @@ -210,6 +210,13 @@ typedef QSet QgsAttributeIds; * attribute operators, “BBOX, Disjoint, Intersects, Touches, Crosses, Contains, Overlaps, Within” * spatial binary operators and the QGIS local “geomFromWKT, geomFromGML” * geometry constructor functions. + + * Also note: + * + * - You can use various functions available in the QGIS Expression list, + * however the function must exist server side and have the same name and arguments to work. + * - Use the special $geometry parameter to provide the layer geometry column as input + * into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)')) * * \subsection oapif OGC API Features data provider (oapif) * @@ -229,13 +236,6 @@ typedef QSet QgsAttributeIds; * - maxNumFeatures=number: maximum number of features to retrieve (possibly across several multiple paging requests) * - hideDownloadProgressDialog=1: to hide the download progress dialog. * - * Also note: - * - * - You can use various functions available in the QGIS Expression list, - * however the function must exist server side and have the same name and arguments to work. - * - Use the special $geometry parameter to provide the layer geometry column as input - * into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)')) - * * \subsection delimitedtext Delimited text file data provider (delimitedtext) * * Accesses data in a delimited text file, for example CSV files generated by