[MESH] fix streamlines and traces renderer when vector is null (#36633)

[MESH] fix streamlines and traces renderer when vector is null
qgis · May 23, 2020 · 42ba3d7 · 42ba3d7
1 parent 204694e
commit 42ba3d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/core/mesh/qgsmeshlayerrenderer.cpp b/src/core/mesh/qgsmeshlayerrenderer.cpp
@@ -550,6 +550,9 @@ void QgsMeshLayerRenderer::renderVectorDataset()
   if ( std::isnan( mVectorDatasetMagMinimum ) || std::isnan( mVectorDatasetMagMaximum ) )
     return; // only NODATA values
 
+  if ( !( mVectorDatasetMagMaximum > 0 ) )
+    return; //all vector are null vector
+
   std::unique_ptr<QgsMeshVectorRenderer> renderer( QgsMeshVectorRenderer::makeVectorRenderer(
         mTriangularMesh,
         mVectorDatasetValues,

diff --git a/src/core/mesh/qgsmeshtracerenderer.cpp b/src/core/mesh/qgsmeshtracerenderer.cpp
@@ -371,8 +371,9 @@ void QgsMeshStreamField::addTrace( QgsPointXY startPoint )
 
 void QgsMeshStreamField::addRandomTraces()
 {
-  while ( mPixelFillingCount < mMaxPixelFillingCount && !mRenderContext.renderingStopped() )
-    addRandomTrace();
+  if ( mMaximumMagnitude > 0 )
+    while ( mPixelFillingCount < mMaxPixelFillingCount && !mRenderContext.renderingStopped() )
+      addRandomTrace();
 }
 
 void QgsMeshStreamField::addRandomTrace()
@@ -429,6 +430,9 @@ void QgsMeshStreamField::addTrace( QPoint startPixel )
   if ( !mVectorValueInterpolator )
     return;
 
+  if ( !( mMaximumMagnitude > 0 ) )
+    return;
+
   mPainter->setPen( mPen );
 
   //position in the pixelField
@@ -910,7 +914,6 @@ QgsMeshVectorStreamlineRenderer::QgsMeshVectorStreamlineRenderer(
   mStreamlineField->setColor( settings.color() );
   mStreamlineField->setFilter( settings.filterMin(), settings.filterMax() );
 
-
   switch ( settings.streamLinesSettings().seedingMethod() )
   {
     case QgsMeshRendererVectorStreamlineSettings::MeshGridded: