From 7c1d1fe97c2fa64b11effa4e78feb5f53424df24 Mon Sep 17 00:00:00 2001 From: Martin Dobias Date: Wed, 8 Apr 2020 09:07:58 +0200 Subject: [PATCH] Fix tests and reference image --- .../qgspropertycollection.sip.in | 12 ++++++------ src/core/qgspropertycollection.h | 9 ++++++--- tests/src/core/testqgsvectortilelayer.cpp | 2 +- .../expected_render_test_labeling.png | Bin 160537 -> 160537 bytes 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/python/core/auto_generated/qgspropertycollection.sip.in b/python/core/auto_generated/qgspropertycollection.sip.in index 399d5345b25..95cb0fffa6c 100644 --- a/python/core/auto_generated/qgspropertycollection.sip.in +++ b/python/core/auto_generated/qgspropertycollection.sip.in @@ -238,12 +238,9 @@ Returns ``True`` if preparation was successful. Returns the set of any fields referenced by the active properties from the collection. :param context: expression context the properties will be evaluated against. - -.. note:: - - The optional argument ignoreContext has been added in QGIS 3.14. When set to true, - even fields not set in context's fields() will be reported - this is useful e.g. with vector tiles - where the actual available field names may not be known beforehand. +:param ignoreContext: This parameter has been added in QGIS 3.14. When set to true, even fields not set + in context's fields() will be reported - this is useful e.g. with vector tiles + where the actual available field names may not be known beforehand. %End virtual bool isActive( int key ) const = 0; @@ -550,6 +547,9 @@ Returns the calculated value of the highest priority property with the specified Returns the set of any fields referenced by the active properties from the stack. :param context: expression context the properties will be evaluated against. +:param ignoreContext: This parameter has been added in QGIS 3.14. When set to true, even fields not set + in context's fields() will be reported - this is useful e.g. with vector tiles + where the actual available field names may not be known beforehand. %End virtual bool prepare( const QgsExpressionContext &context = QgsExpressionContext() ) const; diff --git a/src/core/qgspropertycollection.h b/src/core/qgspropertycollection.h index e148cda1806..27a2d2a247c 100644 --- a/src/core/qgspropertycollection.h +++ b/src/core/qgspropertycollection.h @@ -207,9 +207,9 @@ class CORE_EXPORT QgsAbstractPropertyCollection /** * Returns the set of any fields referenced by the active properties from the collection. * \param context expression context the properties will be evaluated against. - * \note The optional argument ignoreContext has been added in QGIS 3.14. When set to true, - * even fields not set in context's fields() will be reported - this is useful e.g. with vector tiles - * where the actual available field names may not be known beforehand. + * \param ignoreContext This parameter has been added in QGIS 3.14. When set to true, even fields not set + * in context's fields() will be reported - this is useful e.g. with vector tiles + * where the actual available field names may not be known beforehand. */ virtual QSet< QString > referencedFields( const QgsExpressionContext &context = QgsExpressionContext(), bool ignoreContext = false ) const = 0; @@ -478,6 +478,9 @@ class CORE_EXPORT QgsPropertyCollectionStack : public QgsAbstractPropertyCollect /** * Returns the set of any fields referenced by the active properties from the stack. * \param context expression context the properties will be evaluated against. + * \param ignoreContext This parameter has been added in QGIS 3.14. When set to true, even fields not set + * in context's fields() will be reported - this is useful e.g. with vector tiles + * where the actual available field names may not be known beforehand. */ QSet< QString > referencedFields( const QgsExpressionContext &context = QgsExpressionContext(), bool ignoreContext = false ) const override; bool prepare( const QgsExpressionContext &context = QgsExpressionContext() ) const override; diff --git a/tests/src/core/testqgsvectortilelayer.cpp b/tests/src/core/testqgsvectortilelayer.cpp index 25983746359..4e351e15bf8 100644 --- a/tests/src/core/testqgsvectortilelayer.cpp +++ b/tests/src/core/testqgsvectortilelayer.cpp @@ -146,7 +146,7 @@ void TestQgsVectorTileLayer::test_labeling() QgsPalLayerSettings labelSettings; labelSettings.drawLabels = true; - labelSettings.fieldName = "name"; + labelSettings.fieldName = "name:en"; labelSettings.placement = QgsPalLayerSettings::OverPoint; labelSettings.setFormat( format ); diff --git a/tests/testdata/control_images/vector_tile/expected_render_test_labeling/expected_render_test_labeling.png b/tests/testdata/control_images/vector_tile/expected_render_test_labeling/expected_render_test_labeling.png index 6e31af8717e5c7a406cd3f782dfa6b27e8062b0d..b129cac0415e3a8f8bd2ac0b29eb815492cfeaa4 100644 GIT binary patch delta 7976 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 qTwTp=`l=@ml}Nh}mB_QNwQo>kpDw-c*aCjtie*