Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename QgsMeshRendererScalarSettings.DataResampling enum value from None to NoResampling #55999

Merged
merged 1 commit into from
Jan 26, 2024
Merged

rename QgsMeshRendererScalarSettings.DataResampling enum value from None to NoResampling #55999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/PyQt6/core/auto_additions/qgsmeshrenderersettings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/core/mesh/qgsmeshrenderersettings.h
QgsMeshRendererScalarSettings.None_ = QgsMeshRendererScalarSettings.DataResamplingMethod.None_
QgsMeshRendererScalarSettings.NoResampling = QgsMeshRendererScalarSettings.DataResamplingMethod.NoResampling
QgsMeshRendererScalarSettings.NeighbourAverage = QgsMeshRendererScalarSettings.DataResamplingMethod.NeighbourAverage
QgsMeshRendererVectorArrowSettings.MinMax = QgsMeshRendererVectorArrowSettings.ArrowScalingMethod.MinMax
QgsMeshRendererVectorArrowSettings.Scaled = QgsMeshRendererVectorArrowSettings.ArrowScalingMethod.Scaled
Expand Down
2 changes: 1 addition & 1 deletion python/PyQt6/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Represents a mesh renderer settings for scalar datasets
enum DataResamplingMethod
{

None,
NoResampling,

NeighbourAverage,
};
Expand Down
2 changes: 1 addition & 1 deletion python/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Represents a mesh renderer settings for scalar datasets
enum DataResamplingMethod
{

None,
NoResampling,

NeighbourAverage,
};
Expand Down
4 changes: 2 additions & 2 deletions src/core/mesh/qgsmeshlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ QString QgsMeshLayer::loadDefaultStyle( bool &resultFlag )
scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::NeighbourAverage );
break;
case QgsMeshDatasetGroupMetadata::DataOnVertices:
scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::None );
scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::NoResampling );
break;
case QgsMeshDatasetGroupMetadata::DataOnEdges:
break;
Expand Down Expand Up @@ -793,7 +793,7 @@ void QgsMeshLayer::applyClassificationOnScalarSettings( const QgsMeshDatasetGrou
}

scalarSettings.setColorRampShader( colorRampShader );
scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::None );
scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::NoResampling );
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/mesh/qgsmeshlayerrenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ void QgsMeshLayerRenderer::copyScalarDatasetValues( QgsMeshLayer *layer )
mNativeMesh.faces.count() );

// for data on faces, there could be request to interpolate the data to vertices
if ( method != QgsMeshRendererScalarSettings::None )
if ( method != QgsMeshRendererScalarSettings::NoResampling )
{
if ( mScalarDataType == QgsMeshDatasetGroupMetadata::DataType::DataOnFaces )
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/mesh/qgsmeshlayerrenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct CORE_NO_EXPORT QgsMeshLayerRendererCache
QgsMeshDatasetGroupMetadata::DataType mScalarDataType = QgsMeshDatasetGroupMetadata::DataType::DataOnVertices;
double mScalarDatasetMinimum = std::numeric_limits<double>::quiet_NaN();
double mScalarDatasetMaximum = std::numeric_limits<double>::quiet_NaN();
QgsMeshRendererScalarSettings::DataResamplingMethod mDataInterpolationMethod = QgsMeshRendererScalarSettings::None;
QgsMeshRendererScalarSettings::DataResamplingMethod mDataInterpolationMethod = QgsMeshRendererScalarSettings::NoResampling;
std::unique_ptr<QgsMesh3DAveragingMethod> mScalarAveragingMethod;

// vector dataset
Expand Down
6 changes: 3 additions & 3 deletions src/core/mesh/qgsmeshrenderersettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ QDomElement QgsMeshRendererScalarSettings::writeXml( QDomDocument &doc, const Qg
QString methodTxt;
switch ( mDataResamplingMethod )
{
case None:
methodTxt = QStringLiteral( "none" );
case NoResampling:
methodTxt = QStringLiteral( "no-resampling" );
break;
case NeighbourAverage:
methodTxt = QStringLiteral( "neighbour-average" );
Expand Down Expand Up @@ -154,7 +154,7 @@ void QgsMeshRendererScalarSettings::readXml( const QDomElement &elem, const QgsR
}
else
{
mDataResamplingMethod = DataResamplingMethod::None;
mDataResamplingMethod = DataResamplingMethod::NoResampling;
}
const QDomElement elemShader = elem.firstChildElement( QStringLiteral( "colorrampshader" ) );
mColorRampShader.readXml( elemShader, context );
Expand Down
4 changes: 2 additions & 2 deletions src/core/mesh/qgsmeshrenderersettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class CORE_EXPORT QgsMeshRendererScalarSettings
/**
* Does not use resampling
*/
None = 0,
NoResampling = 0,

/**
* Does a simple average of values defined for all surrounding faces/vertices
Expand Down Expand Up @@ -183,7 +183,7 @@ class CORE_EXPORT QgsMeshRendererScalarSettings

private:
QgsColorRampShader mColorRampShader;
DataResamplingMethod mDataResamplingMethod = DataResamplingMethod::None;
DataResamplingMethod mDataResamplingMethod = DataResamplingMethod::NoResampling;
double mClassificationMinimum = 0;
double mClassificationMaximum = 0;
double mOpacity = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/mesh/qgsmeshrendererscalarsettingswidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ QgsMeshRendererScalarSettingsWidget::QgsMeshRendererScalarSettingsWidget( QWidge
mScalarMaxSpinBox->setSpecialValueText( QString( ) );

// add items to data interpolation combo box
mScalarInterpolationTypeComboBox->addItem( tr( "None" ), QgsMeshRendererScalarSettings::None );
mScalarInterpolationTypeComboBox->addItem( tr( "No Resampling" ), QgsMeshRendererScalarSettings::NoResampling );
mScalarInterpolationTypeComboBox->addItem( tr( "Neighbour Average" ), QgsMeshRendererScalarSettings::NeighbourAverage );
mScalarInterpolationTypeComboBox->setCurrentIndex( 0 );

Expand Down
4 changes: 2 additions & 2 deletions tests/src/analysis/testqgsmeshcontours.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void TestQgsMeshContours::testQuadAndTriangleVertexScalarLine()

QgsMeshContours contours( mpMeshLayer.get() );

const QgsGeometry res = contours.exportLines( datasetIndex, value, QgsMeshRendererScalarSettings::None );
const QgsGeometry res = contours.exportLines( datasetIndex, value, QgsMeshRendererScalarSettings::NoResampling );
equals( res, expected );
}

Expand Down Expand Up @@ -190,7 +190,7 @@ void TestQgsMeshContours::testQuadAndTriangleVertexScalarPoly()

QgsMeshContours contours( mpMeshLayer.get() );

const QgsGeometry res = contours.exportPolygons( datasetIndex, min_value, max_value, QgsMeshRendererScalarSettings::None );
const QgsGeometry res = contours.exportPolygons( datasetIndex, min_value, max_value, QgsMeshRendererScalarSettings::NoResampling );
equals( res, expected );
}

Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgsmeshlayerrenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ void TestQgsMeshRenderer::test_stacked_3d_mesh_single_level_averaging()
QVERIFY( metadata.name() == "temperature" );
QVERIFY( metadata.maximumVerticalLevelsCount() == 10 );
QgsMeshRendererScalarSettings scalarSettings = rendererSettings.scalarSettings( ds.group() );
scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::None );
scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::NoResampling );
rendererSettings.setScalarSettings( ds.group(), scalarSettings );
// want to set active vector dataset one defined on 3d mesh
ds = QgsMeshDatasetIndex( 6, 3 );
Expand Down
Loading