From a5c5e201e65534f3407910277a0f13149400ae88 Mon Sep 17 00:00:00 2001 From: signedav Date: Mon, 22 Apr 2024 13:20:08 +0200 Subject: [PATCH] fix comments --- python/PyQt6/core/auto_additions/qgis.py | 2 +- python/core/auto_additions/qgis.py | 2 +- src/core/qgis.h | 2 +- tests/src/python/test_qgsvectorlayerutils.py | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/python/PyQt6/core/auto_additions/qgis.py b/python/PyQt6/core/auto_additions/qgis.py index e7670ddf8522c..ef8d8971abe01 100644 --- a/python/PyQt6/core/auto_additions/qgis.py +++ b/python/PyQt6/core/auto_additions/qgis.py @@ -3218,7 +3218,7 @@ Qgis.FieldDomainDuplicatePolicy.DefaultValue.__doc__ = "Use default field value" Qgis.FieldDomainDuplicatePolicy.Duplicate.__doc__ = "Duplicate original value" Qgis.FieldDomainDuplicatePolicy.UnsetField.__doc__ = "Clears the field value so that the data provider backend will populate using any backend triggers or similar logic (since QGIS 3.30)" -Qgis.FieldDomainDuplicatePolicy.__doc__ = "Duplicate policy for field domains.\n\nWhen a feature is duplicated, defines how the value of attributes\nfollowing the domain are computed.\n\n.. versionadded:: 3.38\n\n" + '* ``DefaultValue``: ' + Qgis.FieldDomainDuplicatePolicy.DefaultValue.__doc__ + '\n' + '* ``Duplicate``: ' + Qgis.FieldDomainDuplicatePolicy.Duplicate.__doc__ + '\n' + '* ``UnsetField``: ' + Qgis.FieldDomainDuplicatePolicy.UnsetField.__doc__ +Qgis.FieldDomainDuplicatePolicy.__doc__ = "Duplicate policy for fields.\n\nWhen a feature is duplicated, defines how the value of attributes\nfollowing the domain are computed.\n\n.. versionadded:: 3.38\n\n" + '* ``DefaultValue``: ' + Qgis.FieldDomainDuplicatePolicy.DefaultValue.__doc__ + '\n' + '* ``Duplicate``: ' + Qgis.FieldDomainDuplicatePolicy.Duplicate.__doc__ + '\n' + '* ``UnsetField``: ' + Qgis.FieldDomainDuplicatePolicy.UnsetField.__doc__ # -- Qgis.FieldDomainDuplicatePolicy.baseClass = Qgis # monkey patching scoped based enum diff --git a/python/core/auto_additions/qgis.py b/python/core/auto_additions/qgis.py index 4fed270ba8074..f885d9a5d8224 100644 --- a/python/core/auto_additions/qgis.py +++ b/python/core/auto_additions/qgis.py @@ -3163,7 +3163,7 @@ Qgis.FieldDomainDuplicatePolicy.DefaultValue.__doc__ = "Use default field value" Qgis.FieldDomainDuplicatePolicy.Duplicate.__doc__ = "Duplicate original value" Qgis.FieldDomainDuplicatePolicy.UnsetField.__doc__ = "Clears the field value so that the data provider backend will populate using any backend triggers or similar logic (since QGIS 3.30)" -Qgis.FieldDomainDuplicatePolicy.__doc__ = "Duplicate policy for field domains.\n\nWhen a feature is duplicated, defines how the value of attributes\nfollowing the domain are computed.\n\n.. versionadded:: 3.38\n\n" + '* ``DefaultValue``: ' + Qgis.FieldDomainDuplicatePolicy.DefaultValue.__doc__ + '\n' + '* ``Duplicate``: ' + Qgis.FieldDomainDuplicatePolicy.Duplicate.__doc__ + '\n' + '* ``UnsetField``: ' + Qgis.FieldDomainDuplicatePolicy.UnsetField.__doc__ +Qgis.FieldDomainDuplicatePolicy.__doc__ = "Duplicate policy for fields.\n\nWhen a feature is duplicated, defines how the value of attributes\nfollowing the domain are computed.\n\n.. versionadded:: 3.38\n\n" + '* ``DefaultValue``: ' + Qgis.FieldDomainDuplicatePolicy.DefaultValue.__doc__ + '\n' + '* ``Duplicate``: ' + Qgis.FieldDomainDuplicatePolicy.Duplicate.__doc__ + '\n' + '* ``UnsetField``: ' + Qgis.FieldDomainDuplicatePolicy.UnsetField.__doc__ # -- Qgis.FieldDomainDuplicatePolicy.baseClass = Qgis # monkey patching scoped based enum diff --git a/src/core/qgis.h b/src/core/qgis.h index a3862cf2be7f4..610718daf04aa 100644 --- a/src/core/qgis.h +++ b/src/core/qgis.h @@ -3219,7 +3219,7 @@ class CORE_EXPORT Qgis Q_ENUM( FieldDomainMergePolicy ) /** - * Duplicate policy for field domains. + * Duplicate policy for fields. * * When a feature is duplicated, defines how the value of attributes * following the domain are computed. diff --git a/tests/src/python/test_qgsvectorlayerutils.py b/tests/src/python/test_qgsvectorlayerutils.py index 3b8b6732efff9..c2fa6f2d3716d 100644 --- a/tests/src/python/test_qgsvectorlayerutils.py +++ b/tests/src/python/test_qgsvectorlayerutils.py @@ -646,9 +646,9 @@ def testDuplicateFeature(self): # > and duplicate policy is concerned result_feature = results[0] self.assertEqual(result_feature.attribute('fldtxt'), l1f1orig.attribute('fldtxt')) - self.assertEqual(result_feature.attribute('policycheck1value'), 'Orig Blabla L1') # duplicated - self.assertEqual(result_feature.attribute('policycheck2value'), 'Def Blabla L1') # default Value - self.assertEqual(result_feature.attribute('policycheck3value'), None) # unset + self.assertEqual(result_feature.attribute('policycheck1value'), 'Orig Blabla L1') # duplicated + self.assertEqual(result_feature.attribute('policycheck2value'), 'Def Blabla L1') # default Value + self.assertEqual(result_feature.attribute('policycheck3value'), None) # unset # > check duplicated children occurred on both layers self.assertEqual(len(results[1].layers()), 2) idx = results[1].layers().index(layer2) @@ -656,17 +656,17 @@ def testDuplicateFeature(self): self.assertTrue(results[1].duplicatedFeatures(layer2)) for child_fid in results[1].duplicatedFeatures(layer2): child_feature = layer2.getFeature(child_fid) - self.assertEqual(child_feature.attribute('policycheck1value'), 'Orig Blabla L2') # duplicated - self.assertEqual(child_feature.attribute('policycheck2value'), 'Def Blabla L2') # default Value - self.assertEqual(child_feature.attribute('policycheck3value'), None) # unset + self.assertEqual(child_feature.attribute('policycheck1value'), 'Orig Blabla L2') # duplicated + self.assertEqual(child_feature.attribute('policycheck2value'), 'Def Blabla L2') # default Value + self.assertEqual(child_feature.attribute('policycheck3value'), None) # unset idx = results[1].layers().index(layer3) self.assertEqual(results[1].layers()[idx], layer3) self.assertTrue(results[1].duplicatedFeatures(layer3)) for child_fid in results[1].duplicatedFeatures(layer3): child_feature = layer3.getFeature(child_fid) - self.assertEqual(child_feature.attribute('policycheck1value'), 'Orig Blabla L3') # duplicated - self.assertEqual(child_feature.attribute('policycheck2value'), 'Def Blabla L3') # default Value - self.assertEqual(child_feature.attribute('policycheck3value'), None) # unset + self.assertEqual(child_feature.attribute('policycheck1value'), 'Orig Blabla L3') # duplicated + self.assertEqual(child_feature.attribute('policycheck2value'), 'Def Blabla L3') # default Value + self.assertEqual(child_feature.attribute('policycheck3value'), None) # unset ''' # testoutput 2