From 07fdd5b9ef949c59dadbc7e8401f6a9974bd87dc Mon Sep 17 00:00:00 2001 From: Andrea Giudiceandrea Date: Tue, 16 Jul 2024 18:29:31 +0200 Subject: [PATCH 1/2] Fix Point Displacement / Cluster renderers --- src/core/symbology/qgspointclusterrenderer.cpp | 2 -- src/core/symbology/qgspointdisplacementrenderer.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/core/symbology/qgspointclusterrenderer.cpp b/src/core/symbology/qgspointclusterrenderer.cpp index 460da3093e79..92296b8bee79 100644 --- a/src/core/symbology/qgspointclusterrenderer.cpp +++ b/src/core/symbology/qgspointclusterrenderer.cpp @@ -200,8 +200,6 @@ QgsPointClusterRenderer *QgsPointClusterRenderer::convertFromRenderer( const Qgs pointRenderer->setTolerance( displacementRenderer->tolerance() ); pointRenderer->setToleranceUnit( displacementRenderer->toleranceUnit() ); pointRenderer->setToleranceMapUnitScale( displacementRenderer->toleranceMapUnitScale() ); - if ( const_cast< QgsPointDisplacementRenderer * >( displacementRenderer )->centerSymbol() ) - pointRenderer->setClusterSymbol( const_cast< QgsPointDisplacementRenderer * >( displacementRenderer )->centerSymbol()->clone() ); renderer->copyRendererData( pointRenderer ); return pointRenderer; } diff --git a/src/core/symbology/qgspointdisplacementrenderer.cpp b/src/core/symbology/qgspointdisplacementrenderer.cpp index b0dcd9a8b4c9..ea2f5a943f58 100644 --- a/src/core/symbology/qgspointdisplacementrenderer.cpp +++ b/src/core/symbology/qgspointdisplacementrenderer.cpp @@ -492,8 +492,6 @@ QgsPointDisplacementRenderer *QgsPointDisplacementRenderer::convertFromRenderer( pointRenderer->setTolerance( clusterRenderer->tolerance() ); pointRenderer->setToleranceUnit( clusterRenderer->toleranceUnit() ); pointRenderer->setToleranceMapUnitScale( clusterRenderer->toleranceMapUnitScale() ); - if ( const_cast< QgsPointClusterRenderer * >( clusterRenderer )->clusterSymbol() ) - pointRenderer->setCenterSymbol( const_cast< QgsPointClusterRenderer * >( clusterRenderer )->clusterSymbol()->clone() ); renderer->copyRendererData( pointRenderer ); return pointRenderer; } From 813b7b9e152bc92c420b96c195de823fe5ce6180 Mon Sep 17 00:00:00 2001 From: Andrea Giudiceandrea Date: Wed, 17 Jul 2024 07:21:54 +0200 Subject: [PATCH 2/2] Adapt tests to new behaviour --- tests/src/python/test_qgspointclusterrenderer.py | 1 - tests/src/python/test_qgspointdisplacementrenderer.py | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/src/python/test_qgspointclusterrenderer.py b/tests/src/python/test_qgspointclusterrenderer.py index 7fea6f06f81f..728e617e4022 100644 --- a/tests/src/python/test_qgspointclusterrenderer.py +++ b/tests/src/python/test_qgspointclusterrenderer.py @@ -166,7 +166,6 @@ def testConvert(self): self.assertEqual(d.tolerance(), 5) self.assertEqual(d.toleranceUnit(), QgsUnitTypes.RenderUnit.RenderMapUnits) self.assertEqual(d.toleranceMapUnitScale(), QgsMapUnitScale(5, 15)) - self.assertEqual(d.clusterSymbol().color(), QColor(0, 255, 0)) self.assertEqual(d.embeddedRenderer().symbol().color().name(), '#fdbf6f') def testRenderNoCluster(self): diff --git a/tests/src/python/test_qgspointdisplacementrenderer.py b/tests/src/python/test_qgspointdisplacementrenderer.py index 36b752029517..eef18c120356 100644 --- a/tests/src/python/test_qgspointdisplacementrenderer.py +++ b/tests/src/python/test_qgspointdisplacementrenderer.py @@ -193,7 +193,6 @@ def testConvert(self): self.assertEqual(d.tolerance(), 5) self.assertEqual(d.toleranceUnit(), QgsUnitTypes.RenderUnit.RenderMapUnits) self.assertEqual(d.toleranceMapUnitScale(), QgsMapUnitScale(5, 15)) - self.assertEqual(d.centerSymbol().color(), QColor(0, 255, 0)) self.assertEqual(d.embeddedRenderer().symbol().color().name(), '#fdbf6f') def testRenderNoCluster(self):