emit dataset group changed after it effectively changed

qgis · Jun 15, 2020 · 300fc9e · 300fc9e
1 parent 5cc0a22
commit 300fc9e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/app/mesh/qgsrenderermeshpropertieswidget.cpp b/src/app/mesh/qgsrenderermeshpropertieswidget.cpp
@@ -169,7 +169,6 @@ void QgsRendererMeshPropertiesWidget::onActiveScalarGroupChanged( int groupIndex
   mMeshRendererScalarSettingsWidget->syncToLayer();
   mContoursGroupBox->setChecked( groupIndex >= 0 );
   mContoursGroupBox->setEnabled( groupIndex >= 0 );
-  emit mMeshLayer->activeScalarDatasetGroupChanged( groupIndex );
 }
 
 void QgsRendererMeshPropertiesWidget::onActiveVectorGroupChanged( int groupIndex )
@@ -181,5 +180,4 @@ void QgsRendererMeshPropertiesWidget::onActiveVectorGroupChanged( int groupIndex
   mMeshRendererVectorSettingsWidget->syncToLayer();
   mVectorsGroupBox->setChecked( groupIndex >= 0 );
   mVectorsGroupBox->setEnabled( groupIndex >= 0 );
-  emit mMeshLayer->activeVectorDatasetGroupChanged( groupIndex );
 }
diff --git a/src/core/mesh/qgsmeshlayer.cpp b/src/core/mesh/qgsmeshlayer.cpp
@@ -267,7 +267,16 @@ QgsMeshRendererSettings QgsMeshLayer::rendererSettings() const
 
 void QgsMeshLayer::setRendererSettings( const QgsMeshRendererSettings &settings )
 {
+  int oldActiveScalar = mRendererSettings.activeScalarDatasetGroup();
+  int oldActiveVector = mRendererSettings.activeVectorDatasetGroup();
   mRendererSettings = settings;
+
+  if ( oldActiveScalar != mRendererSettings.activeScalarDatasetGroup() )
+    emit activeScalarDatasetGroupChanged( mRendererSettings.activeScalarDatasetGroup() );
+
+  if ( oldActiveVector != mRendererSettings.activeVectorDatasetGroup() )
+    emit activeVectorDatasetGroupChanged( mRendererSettings.activeScalarDatasetGroup() );
+
   emit rendererChanged();
   triggerRepaint();
 }
@@ -820,14 +829,24 @@ QgsMeshDatasetIndex QgsMeshLayer::staticScalarDatasetIndex() const
 
 void QgsMeshLayer::setStaticVectorDatasetIndex( const QgsMeshDatasetIndex &staticVectorDatasetIndex )
 {
+  int oldActiveVector = mRendererSettings.activeVectorDatasetGroup();
+
   mStaticVectorDatasetIndex = staticVectorDatasetIndex.dataset();
   mRendererSettings.setActiveVectorDatasetGroup( staticVectorDatasetIndex.group() );
+
+  if ( oldActiveVector != mRendererSettings.activeVectorDatasetGroup() )
+    emit activeVectorDatasetGroupChanged( mRendererSettings.activeScalarDatasetGroup() );
 }
 
 void QgsMeshLayer::setStaticScalarDatasetIndex( const QgsMeshDatasetIndex &staticScalarDatasetIndex )
 {
+  int oldActiveScalar = mRendererSettings.activeScalarDatasetGroup();
+
   mStaticScalarDatasetIndex = staticScalarDatasetIndex.dataset();
   mRendererSettings.setActiveScalarDatasetGroup( staticScalarDatasetIndex.group() );
+
+  if ( oldActiveScalar != mRendererSettings.activeScalarDatasetGroup() )
+    emit activeScalarDatasetGroupChanged( mRendererSettings.activeScalarDatasetGroup() );
 }
 
 QgsMeshSimplificationSettings QgsMeshLayer::meshSimplificationSettings() const