Avoid even more loss of renderer properties when changing renderer type

qgis · Jun 28, 2021 · bb002d4 · bb002d4
1 parent 0565c3f
commit bb002d4
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 0 deletions.
diff --git a/src/core/symbology/qgsnullsymbolrenderer.cpp b/src/core/symbology/qgsnullsymbolrenderer.cpp
@@ -91,6 +91,7 @@ QString QgsNullSymbolRenderer::dump() const
 QgsFeatureRenderer *QgsNullSymbolRenderer::clone() const
 {
   QgsNullSymbolRenderer *r = new QgsNullSymbolRenderer();
+  copyRendererData( r );
   return r;
 }
 

diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -509,6 +509,8 @@ QgsCategorizedSymbolRendererWidget::QgsCategorizedSymbolRendererWidget( QgsVecto
   if ( !mRenderer )
   {
     mRenderer = std::make_unique< QgsCategorizedSymbolRenderer >( QString(), QgsCategoryList() );
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   QString attrName = mRenderer->classAttribute();

diff --git a/src/gui/symbology/qgsembeddedsymbolrendererwidget.cpp b/src/gui/symbology/qgsembeddedsymbolrendererwidget.cpp
@@ -65,6 +65,8 @@ QgsEmbeddedSymbolRendererWidget::QgsEmbeddedSymbolRendererWidget( QgsVectorLayer
   {
     // use default embedded renderer
     mRenderer.reset( new QgsEmbeddedSymbolRenderer( QgsSymbol::defaultSymbol( type ) ) );
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   mDefaultSymbolToolButton->setSymbol( mRenderer->defaultSymbol()->clone() );

diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
@@ -459,6 +459,8 @@ QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLay
   if ( !mRenderer )
   {
     mRenderer = std::make_unique< QgsGraduatedSymbolRenderer >( QString(), QgsRangeList() );
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   // setup user interface

diff --git a/src/gui/symbology/qgsheatmaprendererwidget.cpp b/src/gui/symbology/qgsheatmaprendererwidget.cpp
@@ -110,6 +110,8 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer *layer, QgsSt
   if ( !mRenderer )
   {
     mRenderer = std::make_unique< QgsHeatmapRenderer >();
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   btnColorRamp->setShowGradientOnly( true );

diff --git a/src/gui/symbology/qgsinvertedpolygonrendererwidget.cpp b/src/gui/symbology/qgsinvertedpolygonrendererwidget.cpp
@@ -64,6 +64,8 @@ QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLay
   if ( ! mRenderer )
   {
     mRenderer.reset( new QgsInvertedPolygonRenderer() );
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
   mMergePolygonsCheckBox->blockSignals( true );
   mMergePolygonsCheckBox->setCheckState( mRenderer->preprocessingEnabled() ? Qt::Checked : Qt::Unchecked );

diff --git a/src/gui/symbology/qgsmergedfeaturerendererwidget.cpp b/src/gui/symbology/qgsmergedfeaturerendererwidget.cpp
@@ -63,6 +63,8 @@ QgsMergedFeatureRendererWidget::QgsMergedFeatureRendererWidget( QgsVectorLayer *
   {
     // use default embedded renderer
     mRenderer.reset( new QgsMergedFeatureRenderer( QgsFeatureRenderer::defaultRenderer( type ) ) );
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   int currentEmbeddedIdx = 0;

diff --git a/src/gui/symbology/qgsnullsymbolrendererwidget.cpp b/src/gui/symbology/qgsnullsymbolrendererwidget.cpp
@@ -34,6 +34,8 @@ QgsNullSymbolRendererWidget::QgsNullSymbolRendererWidget( QgsVectorLayer *layer,
   if ( !mRenderer )
   {
     mRenderer = std::make_unique< QgsNullSymbolRenderer >();
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   QGridLayout *layout = new QGridLayout( this );

diff --git a/src/gui/symbology/qgspointclusterrendererwidget.cpp b/src/gui/symbology/qgspointclusterrendererwidget.cpp
@@ -68,6 +68,8 @@ QgsPointClusterRendererWidget::QgsPointClusterRendererWidget( QgsVectorLayer *la
   if ( !mRenderer )
   {
     mRenderer = std::make_unique< QgsPointClusterRenderer >();
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   blockAllSignals( true );

diff --git a/src/gui/symbology/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology/qgspointdisplacementrendererwidget.cpp
@@ -76,6 +76,8 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
   if ( !mRenderer )
   {
     mRenderer = std::make_unique< QgsPointDisplacementRenderer >();
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   blockAllSignals( true );

diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.cpp b/src/gui/symbology/qgsrulebasedrendererwidget.cpp
@@ -69,6 +69,8 @@ QgsRuleBasedRendererWidget::QgsRuleBasedRendererWidget( QgsVectorLayer *layer, Q
     QgsSymbol *symbol = QgsSymbol::defaultSymbol( mLayer->geometryType() );
 
     mRenderer = std::make_unique< QgsRuleBasedRenderer >( symbol );
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   setupUi( this );

diff --git a/src/gui/symbology/qgssinglesymbolrendererwidget.cpp b/src/gui/symbology/qgssinglesymbolrendererwidget.cpp
@@ -49,6 +49,9 @@ QgsSingleSymbolRendererWidget::QgsSingleSymbolRendererWidget( QgsVectorLayer *la
 
     if ( symbol )
       mRenderer = std::make_unique< QgsSingleSymbolRenderer >( symbol );
+
+    if ( renderer )
+      renderer->copyRendererData( mRenderer.get() );
   }
 
   // load symbol from it