fix deactivate mesh layer contours

vcloarec · github-actions[bot] · commit aedbb86f14e6 · 2023-04-25T14:12:13.000Z
diff --git a/src/core/mesh/qgsmeshlayer.cpp b/src/core/mesh/qgsmeshlayer.cpp
@@ -1430,15 +1430,17 @@ QgsAbstractProfileGenerator *QgsMeshLayer::createProfileGenerator( const QgsProf
 void QgsMeshLayer::checkSymbologyConsistency()
 {
   const QList<int> groupIndexes = mDatasetGroupStore->datasetGroupIndexes();
-  if ( !groupIndexes.contains( mRendererSettings.activeScalarDatasetGroup() ) )
+  if ( !groupIndexes.contains( mRendererSettings.activeScalarDatasetGroup() ) &&
+       mRendererSettings.activeScalarDatasetGroup() != -1 )
   {
     if ( !groupIndexes.empty() )
       mRendererSettings.setActiveScalarDatasetGroup( groupIndexes.first() );
     else
       mRendererSettings.setActiveScalarDatasetGroup( -1 );
   }
 
-  if ( !groupIndexes.contains( mRendererSettings.activeVectorDatasetGroup() ) )
+  if ( !groupIndexes.contains( mRendererSettings.activeVectorDatasetGroup() )  &&
+       mRendererSettings.activeVectorDatasetGroup() != -1 )
   {
     mRendererSettings.setActiveVectorDatasetGroup( -1 );
   }

Original file line number	Diff line number	Diff line change
`@@ -1430,15 +1430,17 @@ QgsAbstractProfileGenerator *QgsMeshLayer::createProfileGenerator( const QgsProf`
`1430`	`1430`	`void QgsMeshLayer::checkSymbologyConsistency()`
`1431`	`1431`	`{`
`1432`	`1432`	`const QList<int> groupIndexes = mDatasetGroupStore->datasetGroupIndexes();`
`1433`		`- if ( !groupIndexes.contains( mRendererSettings.activeScalarDatasetGroup() ) )`
	`1433`	`+ if ( !groupIndexes.contains( mRendererSettings.activeScalarDatasetGroup() ) &&`
	`1434`	`+ mRendererSettings.activeScalarDatasetGroup() != -1 )`
`1434`	`1435`	`{`
`1435`	`1436`	`if ( !groupIndexes.empty() )`
`1436`	`1437`	`mRendererSettings.setActiveScalarDatasetGroup( groupIndexes.first() );`
`1437`	`1438`	`else`
`1438`	`1439`	`mRendererSettings.setActiveScalarDatasetGroup( -1 );`
`1439`	`1440`	`}`
`1440`	`1441`
`1441`		`- if ( !groupIndexes.contains( mRendererSettings.activeVectorDatasetGroup() ) )`
	`1442`	`+ if ( !groupIndexes.contains( mRendererSettings.activeVectorDatasetGroup() ) &&`
	`1443`	`+ mRendererSettings.activeVectorDatasetGroup() != -1 )`
`1442`	`1444`	`{`
`1443`	`1445`	`mRendererSettings.setActiveVectorDatasetGroup( -1 );`
`1444`	`1446`	`}`