backport #43010 and #43017

qgis · Apr 29, 2021 · d9d765e · d9d765e
1 parent eed3818
commit d9d765e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/core/qgsmaplayerlegend.cpp b/src/core/qgsmaplayerlegend.cpp
@@ -519,13 +519,19 @@ QList<QgsLayerTreeModelLegendNode *> QgsDefaultMeshLayerLegend::createLayerTreeM
     switch ( shader.colorRampType() )
     {
       case QgsColorRampShader::Interpolated:
-        // for interpolated shaders we use a ramp legend node
-        nodes << new QgsColorRampLegendNode( nodeLayer, shader.sourceColorRamp()->clone(),
-                                             shader.legendSettings() ? *shader.legendSettings() : QgsColorRampLegendNodeSettings(),
-                                             shader.minimumValue(),
-                                             shader.maximumValue() );
-        break;
-
+        if ( ! shader.legendSettings() || shader.legendSettings()->useContinuousLegend() )
+        {
+          // for interpolated shaders we use a ramp legend node
+          if ( !shader.colorRampItemList().isEmpty() )
+          {
+            nodes << new QgsColorRampLegendNode( nodeLayer, shader.createColorRamp(),
+                                                 shader.legendSettings() ? *shader.legendSettings() : QgsColorRampLegendNodeSettings(),
+                                                 shader.minimumValue(),
+                                                 shader.maximumValue() );
+          }
+          break;
+        }
+        Q_FALLTHROUGH();
       case QgsColorRampShader::Discrete:
       case QgsColorRampShader::Exact:
       {

diff --git a/src/gui/raster/qgscolorrampshaderwidget.cpp b/src/gui/raster/qgscolorrampshaderwidget.cpp
@@ -516,6 +516,7 @@ void QgsColorRampShaderWidget::mLoadFromFileButton_clicked()
   settings.setValue( QStringLiteral( "lastColorMapDir" ), fileInfo.absoluteDir().absolutePath() );
 
   loadMinimumMaximumFromTree();
+  updateColorRamp();
   emit widgetChanged();
 }