fix #21931 Mesh calculator crash when used with face dataset

qgis · Apr 29, 2019 · 4bc8aff · 4bc8aff
1 parent 699cff0
commit 4bc8aff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/analysis/mesh/qgsmeshcalcutils.cpp b/src/analysis/mesh/qgsmeshcalcutils.cpp
@@ -61,11 +61,13 @@ std::shared_ptr<QgsMeshMemoryDatasetGroup> QgsMeshCalcUtils::create( const QStri
         for ( int value_i = 0; value_i < count; ++value_i )
           ds->values[value_i] = block.value( value_i );
 
-        const QgsMeshDataBlock active = dp->areFacesActive( index, 0, dp->faceCount() );
+        if ( grp->type == QgsMeshDatasetGroupMetadata::DataOnVertices )
-        Q_ASSERT( active.count() == dp->faceCount() );
+        {
-        for ( int value_i = 0; value_i < dp->faceCount(); ++value_i )
+          const QgsMeshDataBlock active = dp->areFacesActive( index, 0, dp->faceCount() );
-          ds->active[value_i] = active.active( value_i );
+          Q_ASSERT( active.count() == dp->faceCount() );
-
+          for ( int value_i = 0; value_i < dp->faceCount(); ++value_i )
+            ds->active[value_i] = active.active( value_i );
+        }
         grp->addDataset( ds );
       }
 

diff --git a/src/app/mesh/qgsmeshcalculatordialog.cpp b/src/app/mesh/qgsmeshcalculatordialog.cpp
@@ -248,7 +248,7 @@ void QgsMeshCalculatorDialog::mExpressionTextEdit_textChanged()
   }
   else
   {
-    mExpressionValidLabel->setText( tr( "Expression invalid" ) );
+    mExpressionValidLabel->setText( tr( "Expression invalid or datasets type not supported" ) );
   }
   mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
 }