Skip to content

Commit 6d1e420

Browse files
committed
min/max to minimum/maximum renaming
1 parent d91e12d commit 6d1e420

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

python/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ Returns color ramp shader function
9292
Sets color ramp shader function
9393
%End
9494

95-
double classificationMin() const;
95+
double classificationMinimum() const;
9696
%Docstring
9797
Returns min value used for creation of the color ramp shader
9898
%End
99-
double classificationMax() const;
99+
double classificationMaximum() const;
100100
%Docstring
101101
Returns max value used for creation of the color ramp shader
102102
%End
103-
void setClassificationMinMax( double vMin, double vMax );
103+
void setClassificationMinimumMaximum( double minimum, double maximum );
104104
%Docstring
105105
Sets min/max values used for creation of the color ramp shader
106106
%End

src/app/mesh/qgsmeshrendererscalarsettingswidget.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ QgsMeshRendererScalarSettings QgsMeshRendererScalarSettingsWidget::settings() co
4545
{
4646
QgsMeshRendererScalarSettings settings;
4747
settings.setColorRampShader( mScalarColorRampShaderWidget->shader() );
48-
settings.setClassificationMinMax( lineEditValue( mScalarMinLineEdit ), lineEditValue( mScalarMaxLineEdit ) );
48+
settings.setClassificationMinimumMaximum( lineEditValue( mScalarMinLineEdit ), lineEditValue( mScalarMaxLineEdit ) );
4949
return settings;
5050
}
5151

@@ -60,8 +60,8 @@ void QgsMeshRendererScalarSettingsWidget::syncToLayer( )
6060
const QgsMeshRendererSettings rendererSettings = mMeshLayer->rendererSettings();
6161
const QgsMeshRendererScalarSettings settings = rendererSettings.scalarSettings( mActiveDatasetGroup );
6262
const QgsColorRampShader shader = settings.colorRampShader();
63-
whileBlocking( mScalarMinLineEdit )->setText( QString::number( settings.classificationMin() ) );
64-
whileBlocking( mScalarMaxLineEdit )->setText( QString::number( settings.classificationMax() ) );
63+
whileBlocking( mScalarMinLineEdit )->setText( QString::number( settings.classificationMinimum() ) );
64+
whileBlocking( mScalarMaxLineEdit )->setText( QString::number( settings.classificationMaximum() ) );
6565
whileBlocking( mScalarColorRampShaderWidget )->setFromShader( shader );
6666
}
6767

src/core/mesh/qgsmeshlayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ void QgsMeshLayer::assignDefaultStyleToDatasetGroup( int groupIndex )
216216
fcn.classifyColorRamp( 5, -1, QgsRectangle(), nullptr );
217217

218218
QgsMeshRendererScalarSettings scalarSettings;
219-
scalarSettings.setClassificationMinMax( groupMin, groupMax );
219+
scalarSettings.setClassificationMinimumMaximum( groupMin, groupMax );
220220
scalarSettings.setColorRampShader( fcn );
221221
mRendererSettings.setScalarSettings( groupIndex, scalarSettings );
222222
}

src/core/mesh/qgsmeshlayerrenderer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ void QgsMeshLayerRenderer::renderScalarDataset()
211211
sh->setRasterShaderFunction( fcn ); // takes ownership of fcn
212212
QgsMeshLayerInterpolator interpolator( mTriangularMesh, mScalarDatasetValues, mScalarDataOnVertices, mContext, mOutputSize );
213213
QgsSingleBandPseudoColorRenderer renderer( &interpolator, 0, sh ); // takes ownership of sh
214-
renderer.setClassificationMin( scalarSettings.classificationMin() );
215-
renderer.setClassificationMax( scalarSettings.classificationMax() );
214+
renderer.setClassificationMin( scalarSettings.classificationMinimum() );
215+
renderer.setClassificationMax( scalarSettings.classificationMaximum() );
216216

217217
std::unique_ptr<QgsRasterBlock> bl( renderer.block( 0, mContext.extent(), mOutputSize.width(), mOutputSize.height(), mFeedback.get() ) );
218218
QImage img = bl->image();

src/core/mesh/qgsmeshrenderersettings.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -78,26 +78,26 @@ void QgsMeshRendererScalarSettings::setColorRampShader( const QgsColorRampShader
7878
mColorRampShader = shader;
7979
}
8080

81-
void QgsMeshRendererScalarSettings::setClassificationMinMax( double vMin, double vMax )
81+
void QgsMeshRendererScalarSettings::setClassificationMinimumMaximum( double minimum, double maximum )
8282
{
83-
mClassificationMin = vMin;
84-
mClassificationMax = vMax;
83+
mClassificationMinimum = minimum;
84+
mClassificationMaximum = maximum;
8585
}
8686

8787
QDomElement QgsMeshRendererScalarSettings::writeXml( QDomDocument &doc ) const
8888
{
8989
QDomElement elem = doc.createElement( "scalar-settings" );
90-
elem.setAttribute( "min-val", mClassificationMin );
91-
elem.setAttribute( "max-val", mClassificationMax );
90+
elem.setAttribute( "min-val", mClassificationMinimum );
91+
elem.setAttribute( "max-val", mClassificationMaximum );
9292
QDomElement elemShader = mColorRampShader.writeXml( doc );
9393
elem.appendChild( elemShader );
9494
return elem;
9595
}
9696

9797
void QgsMeshRendererScalarSettings::readXml( const QDomElement &elem )
9898
{
99-
mClassificationMin = elem.attribute( "min-val" ).toDouble();
100-
mClassificationMax = elem.attribute( "max-val" ).toDouble();
99+
mClassificationMinimum = elem.attribute( "min-val" ).toDouble();
100+
mClassificationMaximum = elem.attribute( "max-val" ).toDouble();
101101
QDomElement elemShader = elem.firstChildElement( QStringLiteral( "colorrampshader" ) );
102102
mColorRampShader.readXml( elemShader );
103103
}

src/core/mesh/qgsmeshrenderersettings.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ class CORE_EXPORT QgsMeshRendererScalarSettings
8383
void setColorRampShader( const QgsColorRampShader &shader );
8484

8585
//! Returns min value used for creation of the color ramp shader
86-
double classificationMin() const { return mClassificationMin; }
86+
double classificationMinimum() const { return mClassificationMinimum; }
8787
//! Returns max value used for creation of the color ramp shader
88-
double classificationMax() const { return mClassificationMax; }
88+
double classificationMaximum() const { return mClassificationMaximum; }
8989
//! Sets min/max values used for creation of the color ramp shader
90-
void setClassificationMinMax( double vMin, double vMax );
90+
void setClassificationMinimumMaximum( double minimum, double maximum );
9191

9292
//! Writes configuration to a new DOM element
9393
QDomElement writeXml( QDomDocument &doc ) const;
@@ -96,8 +96,8 @@ class CORE_EXPORT QgsMeshRendererScalarSettings
9696

9797
private:
9898
QgsColorRampShader mColorRampShader;
99-
double mClassificationMin = 0;
100-
double mClassificationMax = 0;
99+
double mClassificationMinimum = 0;
100+
double mClassificationMaximum = 0;
101101
};
102102

103103
/**

0 commit comments

Comments
 (0)