sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

emit dataset group changed after it effectively changed

Browse Source
This commit is contained in:
vcloarec 2020-06-13 23:30:23 -04:00 committed by Nyall Dawson
parent 5cc0a224af
commit 300fc9e9af
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/mesh/qgsrenderermeshpropertieswidget.cpp
View File

@ -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 );
}

19
src/core/mesh/qgsmeshlayer.cpp
View File

@ -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