From b99cc5c1f8cc9d15e8d5f9ee402b7755413fde61 Mon Sep 17 00:00:00 2001 From: vcloarec Date: Sun, 5 Apr 2020 18:55:32 -0400 Subject: [PATCH] allow resampling method for default mesh vector dataset --- src/core/mesh/qgsmeshlayer.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/core/mesh/qgsmeshlayer.cpp b/src/core/mesh/qgsmeshlayer.cpp index 135f18277304..06c8bb3318b7 100644 --- a/src/core/mesh/qgsmeshlayer.cpp +++ b/src/core/mesh/qgsmeshlayer.cpp @@ -82,23 +82,20 @@ void QgsMeshLayer::setDefaultRendererSettings() for ( int i = 0; i < mDataProvider->datasetGroupCount(); ++i ) { QgsMeshDatasetGroupMetadata meta = mDataProvider->datasetGroupMetadata( i ); - if ( meta.isScalar() ) + QgsMeshRendererScalarSettings scalarSettings = mRendererSettings.scalarSettings( i ); + switch ( meta.dataType() ) { - QgsMeshRendererScalarSettings scalarSettings = mRendererSettings.scalarSettings( i ); - switch ( meta.dataType() ) - { - case QgsMeshDatasetGroupMetadata::DataOnFaces: - case QgsMeshDatasetGroupMetadata::DataOnVolumes: // data on volumes are averaged to 2D data on faces - scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::NeighbourAverage ); - break; - case QgsMeshDatasetGroupMetadata::DataOnVertices: - scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::None ); - break; - case QgsMeshDatasetGroupMetadata::DataOnEdges: - break; - } - mRendererSettings.setScalarSettings( i, scalarSettings ); + case QgsMeshDatasetGroupMetadata::DataOnFaces: + case QgsMeshDatasetGroupMetadata::DataOnVolumes: // data on volumes are averaged to 2D data on faces + scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::NeighbourAverage ); + break; + case QgsMeshDatasetGroupMetadata::DataOnVertices: + scalarSettings.setDataResamplingMethod( QgsMeshRendererScalarSettings::None ); + break; + case QgsMeshDatasetGroupMetadata::DataOnEdges: + break; } + mRendererSettings.setScalarSettings( i, scalarSettings ); } }