Fix missing min/max values for classification when changing datasets

wonder-sk · wonder-sk · commit d91e12d41706 · 2018-08-17T09:34:41.000+02:00
The min/max values were stored in the color ramp shader, but to my surprise
these values were never persisted or copied: pseudo-color raster renderer
has a separate storage for the min/max values, so we need that for mesh renderer
as well.

The QgsRasterShaderFunction is not really useful, and QgsColorRamp should not
be derived from it, making things just more confusing.
diff --git a/python/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in b/python/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in
@@ -90,6 +90,19 @@ Returns color ramp shader function
     void setColorRampShader( const QgsColorRampShader &shader );
 %Docstring
 Sets color ramp shader function
+%End
+
+    double classificationMin() const;
+%Docstring
+Returns min value used for creation of the color ramp shader
+%End
+    double classificationMax() const;
+%Docstring
+Returns max value used for creation of the color ramp shader
+%End
+    void setClassificationMinMax( double vMin, double vMax );
+%Docstring
+Sets min/max values used for creation of the color ramp shader
 %End
 
     QDomElement writeXml( QDomDocument &doc ) const;
diff --git a/src/app/mesh/qgsmeshrendererscalarsettingswidget.cpp b/src/app/mesh/qgsmeshrendererscalarsettingswidget.cpp
@@ -45,6 +45,7 @@ QgsMeshRendererScalarSettings QgsMeshRendererScalarSettingsWidget::settings() co
 {
   QgsMeshRendererScalarSettings settings;
   settings.setColorRampShader( mScalarColorRampShaderWidget->shader() );
+  settings.setClassificationMinMax( lineEditValue( mScalarMinLineEdit ), lineEditValue( mScalarMaxLineEdit ) );
   return settings;
 }
 
@@ -59,8 +60,8 @@ void QgsMeshRendererScalarSettingsWidget::syncToLayer( )
   const QgsMeshRendererSettings rendererSettings = mMeshLayer->rendererSettings();
   const QgsMeshRendererScalarSettings settings = rendererSettings.scalarSettings( mActiveDatasetGroup );
   const QgsColorRampShader shader = settings.colorRampShader();
-  whileBlocking( mScalarMinLineEdit )->setText( QString::number( shader.minimumValue() ) );
-  whileBlocking( mScalarMaxLineEdit )->setText( QString::number( shader.maximumValue() ) );
+  whileBlocking( mScalarMinLineEdit )->setText( QString::number( settings.classificationMin() ) );
+  whileBlocking( mScalarMaxLineEdit )->setText( QString::number( settings.classificationMax() ) );
   whileBlocking( mScalarColorRampShaderWidget )->setFromShader( shader );
 }
 
diff --git a/src/core/mesh/qgsmeshlayer.cpp b/src/core/mesh/qgsmeshlayer.cpp
@@ -216,6 +216,7 @@ void QgsMeshLayer::assignDefaultStyleToDatasetGroup( int groupIndex )
   fcn.classifyColorRamp( 5, -1, QgsRectangle(), nullptr );
 
   QgsMeshRendererScalarSettings scalarSettings;
+  scalarSettings.setClassificationMinMax( groupMin, groupMax );
   scalarSettings.setColorRampShader( fcn );
   mRendererSettings.setScalarSettings( groupIndex, scalarSettings );
 }
diff --git a/src/core/mesh/qgsmeshlayerrenderer.cpp b/src/core/mesh/qgsmeshlayerrenderer.cpp
@@ -205,13 +205,14 @@ void QgsMeshLayerRenderer::renderScalarDataset()
   if ( !index.isValid() )
     return; // no shader
 
-  QgsColorRampShader *fcn = new QgsColorRampShader( mRendererSettings.scalarSettings( index.group() ).colorRampShader() );
+  const QgsMeshRendererScalarSettings scalarSettings = mRendererSettings.scalarSettings( index.group() );
+  QgsColorRampShader *fcn = new QgsColorRampShader( scalarSettings.colorRampShader() );
   QgsRasterShader *sh = new QgsRasterShader();
   sh->setRasterShaderFunction( fcn );  // takes ownership of fcn
   QgsMeshLayerInterpolator interpolator( mTriangularMesh, mScalarDatasetValues, mScalarDataOnVertices, mContext, mOutputSize );
   QgsSingleBandPseudoColorRenderer renderer( &interpolator, 0, sh );  // takes ownership of sh
-  renderer.setClassificationMin( fcn->minimumValue() );
-  renderer.setClassificationMax( fcn->maximumValue() );
+  renderer.setClassificationMin( scalarSettings.classificationMin() );
+  renderer.setClassificationMax( scalarSettings.classificationMax() );
 
   std::unique_ptr<QgsRasterBlock> bl( renderer.block( 0, mContext.extent(), mOutputSize.width(), mOutputSize.height(), mFeedback.get() ) );
   QImage img = bl->image();
diff --git a/src/core/mesh/qgsmeshrenderersettings.cpp b/src/core/mesh/qgsmeshrenderersettings.cpp
@@ -78,16 +78,26 @@ void QgsMeshRendererScalarSettings::setColorRampShader( const QgsColorRampShader
   mColorRampShader = shader;
 }
 
+void QgsMeshRendererScalarSettings::setClassificationMinMax( double vMin, double vMax )
+{
+  mClassificationMin = vMin;
+  mClassificationMax = vMax;
+}
+
 QDomElement QgsMeshRendererScalarSettings::writeXml( QDomDocument &doc ) const
 {
   QDomElement elem = doc.createElement( "scalar-settings" );
+  elem.setAttribute( "min-val", mClassificationMin );
+  elem.setAttribute( "max-val", mClassificationMax );
   QDomElement elemShader = mColorRampShader.writeXml( doc );
   elem.appendChild( elemShader );
   return elem;
 }
 
 void QgsMeshRendererScalarSettings::readXml( const QDomElement &elem )
 {
+  mClassificationMin = elem.attribute( "min-val" ).toDouble();
+  mClassificationMax = elem.attribute( "max-val" ).toDouble();
   QDomElement elemShader = elem.firstChildElement( QStringLiteral( "colorrampshader" ) );
   mColorRampShader.readXml( elemShader );
 }
diff --git a/src/core/mesh/qgsmeshrenderersettings.h b/src/core/mesh/qgsmeshrenderersettings.h
@@ -82,13 +82,22 @@ class CORE_EXPORT QgsMeshRendererScalarSettings
     //! Sets color ramp shader function
     void setColorRampShader( const QgsColorRampShader &shader );
 
+    //! Returns min value used for creation of the color ramp shader
+    double classificationMin() const { return mClassificationMin; }
+    //! Returns max value used for creation of the color ramp shader
+    double classificationMax() const { return mClassificationMax; }
+    //! Sets min/max values used for creation of the color ramp shader
+    void setClassificationMinMax( double vMin, double vMax );
+
     //! Writes configuration to a new DOM element
     QDomElement writeXml( QDomDocument &doc ) const;
     //! Reads configuration from the given DOM element
     void readXml( const QDomElement &elem );
 
   private:
     QgsColorRampShader mColorRampShader;
+    double mClassificationMin = 0;
+    double mClassificationMax = 0;
 };
 
 /**
diff --git a/src/ui/mesh/qgsmeshrendererscalarsettingswidgetbase.ui b/src/ui/mesh/qgsmeshrendererscalarsettingswidgetbase.ui
@@ -47,7 +47,7 @@
      <item>
       <widget class="QPushButton" name="mScalarRecalculateMinMaxButton">
        <property name="text">
-        <string>Recalculate</string>
+        <string>Load</string>
        </property>
       </widget>
      </item>

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ QgsMeshRendererScalarSettings QgsMeshRendererScalarSettingsWidget::settings() co`
`45`	`45`	`{`
`46`	`46`	`QgsMeshRendererScalarSettings settings;`
`47`	`47`	`settings.setColorRampShader( mScalarColorRampShaderWidget->shader() );`
	`48`	`+ settings.setClassificationMinMax( lineEditValue( mScalarMinLineEdit ), lineEditValue( mScalarMaxLineEdit ) );`
`48`	`49`	`return settings;`
`49`	`50`	`}`
`50`	`51`
`@@ -59,8 +60,8 @@ void QgsMeshRendererScalarSettingsWidget::syncToLayer( )`
`59`	`60`	`const QgsMeshRendererSettings rendererSettings = mMeshLayer->rendererSettings();`
`60`	`61`	`const QgsMeshRendererScalarSettings settings = rendererSettings.scalarSettings( mActiveDatasetGroup );`
`61`	`62`	`const QgsColorRampShader shader = settings.colorRampShader();`
`62`		`- whileBlocking( mScalarMinLineEdit )->setText( QString::number( shader.minimumValue() ) );`
`63`		`- whileBlocking( mScalarMaxLineEdit )->setText( QString::number( shader.maximumValue() ) );`
	`63`	`+ whileBlocking( mScalarMinLineEdit )->setText( QString::number( settings.classificationMin() ) );`
	`64`	`+ whileBlocking( mScalarMaxLineEdit )->setText( QString::number( settings.classificationMax() ) );`
`64`	`65`	`whileBlocking( mScalarColorRampShaderWidget )->setFromShader( shader );`
`65`	`66`	`}`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@ void QgsMeshLayer::assignDefaultStyleToDatasetGroup( int groupIndex )`
`216`	`216`	`fcn.classifyColorRamp( 5, -1, QgsRectangle(), nullptr );`
`217`	`217`
`218`	`218`	`QgsMeshRendererScalarSettings scalarSettings;`
	`219`	`+ scalarSettings.setClassificationMinMax( groupMin, groupMax );`
`219`	`220`	`scalarSettings.setColorRampShader( fcn );`
`220`	`221`	`mRendererSettings.setScalarSettings( groupIndex, scalarSettings );`
`221`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,16 +78,26 @@ void QgsMeshRendererScalarSettings::setColorRampShader( const QgsColorRampShader`
`78`	`78`	`mColorRampShader = shader;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+void QgsMeshRendererScalarSettings::setClassificationMinMax( double vMin, double vMax )`
	`82`	`+{`
	`83`	`+ mClassificationMin = vMin;`
	`84`	`+ mClassificationMax = vMax;`
	`85`	`+}`
	`86`	`+`
`81`	`87`	`QDomElement QgsMeshRendererScalarSettings::writeXml( QDomDocument &doc ) const`
`82`	`88`	`{`
`83`	`89`	`QDomElement elem = doc.createElement( "scalar-settings" );`
	`90`	`+ elem.setAttribute( "min-val", mClassificationMin );`
	`91`	`+ elem.setAttribute( "max-val", mClassificationMax );`
`84`	`92`	`QDomElement elemShader = mColorRampShader.writeXml( doc );`
`85`	`93`	`elem.appendChild( elemShader );`
`86`	`94`	`return elem;`
`87`	`95`	`}`
`88`	`96`
`89`	`97`	`void QgsMeshRendererScalarSettings::readXml( const QDomElement &elem )`
`90`	`98`	`{`
	`99`	`+ mClassificationMin = elem.attribute( "min-val" ).toDouble();`
	`100`	`+ mClassificationMax = elem.attribute( "max-val" ).toDouble();`
`91`	`101`	`QDomElement elemShader = elem.firstChildElement( QStringLiteral( "colorrampshader" ) );`
`92`	`102`	`mColorRampShader.readXml( elemShader );`
`93`	`103`	`}`