Two small mesh layer GUI fixes

wonder-sk · nyalldawson · commit 36d33ee65d01 · 2018-10-04T06:13:32.000+10:00
- update native/triangular mesh enabled/disabled setting from layer
- update time slider/cobmo from layer
diff --git a/src/app/mesh/qgsmeshrendereractivedatasetwidget.cpp b/src/app/mesh/qgsmeshrendereractivedatasetwidget.cpp
@@ -87,10 +87,13 @@ void QgsMeshRendererActiveDatasetWidget::setTimeRange()
   }
 
   // update slider
+  mDatasetSlider->blockSignals( true );
   mDatasetSlider->setMinimum( 0 );
   mDatasetSlider->setMaximum( datasetCount - 1 );
+  mDatasetSlider->blockSignals( false );
 
   // update combobox
+  mTimeComboBox->blockSignals( true );
   mTimeComboBox->clear();
   if ( groupWithMaximumDatasets > -1 )
   {
@@ -102,6 +105,7 @@ void QgsMeshRendererActiveDatasetWidget::setTimeRange()
       mTimeComboBox->addItem( timeToString( time ), time );
     }
   }
+  mTimeComboBox->blockSignals( false );
 
   // enable/disable time controls depending on whether the data set is time varying
   bool isTimeVarying = datasetCount > 1;
diff --git a/src/app/mesh/qgsrenderermeshpropertieswidget.cpp b/src/app/mesh/qgsrenderermeshpropertieswidget.cpp
@@ -110,6 +110,9 @@ void QgsRendererMeshPropertiesWidget::syncToLayer()
   mNativeMeshSettingsWidget->syncToLayer();
   mTriangularMeshSettingsWidget->syncToLayer();
 
+  mNativeMeshGroup->setChecked( mMeshLayer ? mMeshLayer->rendererSettings().nativeMeshSettings().isEnabled() : false );
+  mTriangularMeshGroup->setChecked( mMeshLayer ? mMeshLayer->rendererSettings().triangularMeshSettings().isEnabled() : false );
+
   onActiveScalarGroupChanged( mMeshRendererActiveDatasetWidget->activeScalarDatasetGroup() );
   onActiveVectorGroupChanged( mMeshRendererActiveDatasetWidget->activeVectorDatasetGroup() );
 }

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,13 @@ void QgsMeshRendererActiveDatasetWidget::setTimeRange()`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`// update slider`
	`90`	`+ mDatasetSlider->blockSignals( true );`
`90`	`91`	`mDatasetSlider->setMinimum( 0 );`
`91`	`92`	`mDatasetSlider->setMaximum( datasetCount - 1 );`
	`93`	`+ mDatasetSlider->blockSignals( false );`
`92`	`94`
`93`	`95`	`// update combobox`
	`96`	`+ mTimeComboBox->blockSignals( true );`
`94`	`97`	`mTimeComboBox->clear();`
`95`	`98`	`if ( groupWithMaximumDatasets > -1 )`
`96`	`99`	`{`
`@@ -102,6 +105,7 @@ void QgsMeshRendererActiveDatasetWidget::setTimeRange()`
`102`	`105`	`mTimeComboBox->addItem( timeToString( time ), time );`
`103`	`106`	`}`
`104`	`107`	`}`
	`108`	`+ mTimeComboBox->blockSignals( false );`
`105`	`109`
`106`	`110`	`// enable/disable time controls depending on whether the data set is time varying`
`107`	`111`	`bool isTimeVarying = datasetCount > 1;`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ void QgsRendererMeshPropertiesWidget::syncToLayer()`
`110`	`110`	`mNativeMeshSettingsWidget->syncToLayer();`
`111`	`111`	`mTriangularMeshSettingsWidget->syncToLayer();`
`112`	`112`
	`113`	`+ mNativeMeshGroup->setChecked( mMeshLayer ? mMeshLayer->rendererSettings().nativeMeshSettings().isEnabled() : false );`
	`114`	`+ mTriangularMeshGroup->setChecked( mMeshLayer ? mMeshLayer->rendererSettings().triangularMeshSettings().isEnabled() : false );`
	`115`	`+`
`113`	`116`	`onActiveScalarGroupChanged( mMeshRendererActiveDatasetWidget->activeScalarDatasetGroup() );`
`114`	`117`	`onActiveVectorGroupChanged( mMeshRendererActiveDatasetWidget->activeVectorDatasetGroup() );`
`115`	`118`	`}`