fix #28761 [mesh] Time slider for non-temporal data should be disabled

qgis · Jul 1, 2019 · 28bb53e · 28bb53e
1 parent b89ed82
commit 28bb53e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/app/mesh/qgsmeshrendereractivedatasetwidget.cpp b/src/app/mesh/qgsmeshrendereractivedatasetwidget.cpp
@@ -116,7 +116,14 @@ void QgsMeshRendererActiveDatasetWidget::setTimeRange()
   mTimeComboBox->blockSignals( false );
 
   // enable/disable time controls depending on whether the data set is time varying
-  bool isTimeVarying = datasetCount > 1;
+  enableTimeControls();
+}
+
+void QgsMeshRendererActiveDatasetWidget::enableTimeControls()
+{
+  const int scalarDatesets = mMeshLayer->dataProvider()->datasetCount( mActiveScalarDatasetGroup );
+  const int vectorDatesets = mMeshLayer->dataProvider()->datasetCount( mActiveVectorDatasetGroup );
+  const bool isTimeVarying = ( scalarDatesets > 1 ) || ( vectorDatesets > 1 );
   mTimeComboBox->setEnabled( isTimeVarying );
   mDatasetSlider->setEnabled( isTimeVarying );
   mTimeFormatButton->setEnabled( isTimeVarying );
@@ -132,6 +139,10 @@ void QgsMeshRendererActiveDatasetWidget::onActiveScalarGroupChanged( int groupIn
     return;
 
   mActiveScalarDatasetGroup = groupIndex;
+
+  // enable/disable time slider controls
+  enableTimeControls();
+
   // keep the same timestep if possible
   onActiveTimeChanged( mTimeComboBox->currentIndex() );
   emit activeScalarGroupChanged( mActiveScalarDatasetGroup );
@@ -143,6 +154,8 @@ void QgsMeshRendererActiveDatasetWidget::onActiveVectorGroupChanged( int groupIn
     return;
 
   mActiveVectorDatasetGroup = groupIndex;
+  // enable/disable time slider controls
+  enableTimeControls();
 
   // keep the same timestep if possible
   onActiveTimeChanged( mTimeComboBox->currentIndex() );

diff --git a/src/app/mesh/qgsmeshrendereractivedatasetwidget.h b/src/app/mesh/qgsmeshrendereractivedatasetwidget.h
@@ -28,8 +28,9 @@ class QgsMeshLayer;
  * Widget for selection of active dataset group from tree view.
  * Also selects the active scalar and vector dataset by slider
  *
- * At the moment, it is not possible to select different vector and
- * scalar dataset
+ * User can choose different scalar and vector dataset.
+ * Time slider is deactivated when no dataset is selected or
+ * when all selected datasets are non-temporal.
  */
 class APP_EXPORT QgsMeshRendererActiveDatasetWidget : public QWidget, private Ui::QgsMeshRendererActiveDatasetWidgetBase
 {
@@ -88,6 +89,9 @@ class APP_EXPORT QgsMeshRendererActiveDatasetWidget : public QWidget, private Ui
     //! Loops through all dataset groups and finds the maximum number of datasets
     void setTimeRange();
 
+    //! Enables/Disables time controls depending on whether the selected datasets are time varying
+    void enableTimeControls();
+
     void updateMetadata();
 
     QgsMeshLayer *mMeshLayer = nullptr; // not owned