Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Point Displacement / Point Cluster symbology when switching between them (Fix #58040) #58139

Merged
merged 2 commits into from
Jul 17, 2024
+0 −6
Merged

Fix Point Displacement / Point Cluster symbology when switching between them (Fix #58040) #58139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07fdd5b
Fix Point Displacement / Cluster renderers
agiudiceandrea Jul 16, 2024
813b7b9
Adapt tests to new behaviour
agiudiceandrea Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/core/symbology/qgspointclusterrenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions src/core/symbology/qgspointdisplacementrenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion tests/src/python/test_qgspointclusterrenderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
1 change: 0 additions & 1 deletion tests/src/python/test_qgspointdisplacementrenderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading