fix applying styles from QML files with missing colorramp node

iona5 · iona5 · commit 7368e7f7ec89 · 2020-07-31T22:16:29.000+02:00
When applying a style file with a colorrampshader node but without
a colorramp node, the actual color values of the items of the ramp
are overwritten by the default ramp (currently 'Spectral'). Files
with not colorramp node happened to be created by earlier QGIS
versions - at least with 2.10.

This is because the default ramp is applied after populating the
color ramp item list. Applying a color ramp emits a
colorRampChanged() signal. This signal causes new colors from the
ramp applied to the items, overwriting the already set ones.

This is not desired. Fix by populating the item list after applying
the color ramp.
diff --git a/src/gui/raster/qgscolorrampshaderwidget.cpp b/src/gui/raster/qgscolorrampshaderwidget.cpp
@@ -644,8 +644,6 @@ void QgsColorRampShaderWidget::mColormapTreeWidget_itemEdited( QTreeWidgetItem *
 
 void QgsColorRampShaderWidget::setFromShader( const QgsColorRampShader &colorRampShader )
 {
-  populateColormapTreeWidget( colorRampShader.colorRampItemList() );
-
   // Those objects are connected to classify() the color ramp shader if they change, or call widget change
   // need to block them to avoid to classify and to alter the color ramp, or to call duplicate widget change
   whileBlocking( mClipCheckBox )->setChecked( colorRampShader.clip() );
@@ -666,6 +664,8 @@ void QgsColorRampShaderWidget::setFromShader( const QgsColorRampShader &colorRam
     btnColorRamp->setColorRampFromName( defaultPalette );
   }
 
+  populateColormapTreeWidget( colorRampShader.colorRampItemList() );
+
   emit widgetChanged();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -644,8 +644,6 @@ void QgsColorRampShaderWidget::mColormapTreeWidget_itemEdited( QTreeWidgetItem *`
`644`	`644`
`645`	`645`	`void QgsColorRampShaderWidget::setFromShader( const QgsColorRampShader &colorRampShader )`
`646`	`646`	`{`
`647`		`- populateColormapTreeWidget( colorRampShader.colorRampItemList() );`
`648`		`-`
`649`	`647`	`// Those objects are connected to classify() the color ramp shader if they change, or call widget change`
`650`	`648`	`// need to block them to avoid to classify and to alter the color ramp, or to call duplicate widget change`
`651`	`649`	`whileBlocking( mClipCheckBox )->setChecked( colorRampShader.clip() );`
`@@ -666,6 +664,8 @@ void QgsColorRampShaderWidget::setFromShader( const QgsColorRampShader &colorRam`
`666`	`664`	`btnColorRamp->setColorRampFromName( defaultPalette );`
`667`	`665`	`}`
`668`	`666`
	`667`	`+ populateColormapTreeWidget( colorRampShader.colorRampItemList() );`
	`668`	`+`
`669`	`669`	`emit widgetChanged();`
`670`	`670`	`}`
`671`	`671`