fix for circular activation of raster temporal properties

qgis · Apr 28, 2020 · 9fdf50f · 9fdf50f
1 parent 68896bf
commit 9fdf50f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -11079,7 +11079,7 @@ void QgisApp::projectTemporalRangeChanged()
         QgsDateTimeRange range = QgsProject::instance()->timeSettings()->temporalRange();
         if ( range.begin().isValid() && range.end().isValid() )
         {
-          QString time = range.begin().toString( Qt::ISODateWithMs ) + "/" +
+          QString time = range.begin().toString( Qt::ISODateWithMs ) + '/' +
                          range.end().toString( Qt::ISODateWithMs );
 
           uri[ QStringLiteral( "time" ) ] = time;

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -127,6 +127,11 @@ QgsRasterLayer::QgsRasterLayer( const QString &uri,
 
   setDataSource( uri, baseName, providerKey, providerOptions, options.loadDefaultStyle );
 
+  if ( mValid )
+  {
+    mTemporalProperties->setDefaultsFromDataProviderTemporalCapabilities( mDataProvider->temporalCapabilities() );
+  }
+
 } // QgsRasterLayer ctor
 
 QgsRasterLayer::~QgsRasterLayer()
@@ -871,8 +876,6 @@ void QgsRasterLayer::setDataSource( const QString &dataSource, const QString &ba
 
   if ( mValid )
   {
-    mTemporalProperties->setDefaultsFromDataProviderTemporalCapabilities( mDataProvider->temporalCapabilities() );
-
     // load default style
     bool defaultLoadedFlag = false;
     bool restoredStyle = false;

diff --git a/src/core/raster/qgsrasterlayertemporalproperties.cpp b/src/core/raster/qgsrasterlayertemporalproperties.cpp
@@ -133,6 +133,7 @@ void QgsRasterLayerTemporalProperties::setDefaultsFromDataProviderTemporalCapabi
 {
   if ( const QgsRasterDataProviderTemporalCapabilities *rasterCaps = dynamic_cast< const QgsRasterDataProviderTemporalCapabilities *>( capabilities ) )
   {
+    setIsActive( rasterCaps->hasTemporalCapabilities() );
     setFixedTemporalRange( rasterCaps->availableTemporalRange() );
 
     if ( rasterCaps->hasTemporalCapabilities() )

diff --git a/src/gui/raster/qgsrasterlayerproperties.cpp b/src/gui/raster/qgsrasterlayerproperties.cpp
@@ -1269,11 +1269,11 @@ void QgsRasterLayerProperties::updateSourceStaticTime()
         range = QgsProject::instance()->timeSettings()->temporalRange();
       if ( range.begin().isValid() && range.end().isValid() )
       {
-        QString time = range.begin().toString( Qt::ISODateWithMs ) + "/" +
+        QString time = range.begin().toString( Qt::ISODateWithMs ) + '/' +
                        range.end().toString( Qt::ISODateWithMs );
 
         uri[ QStringLiteral( "time" ) ] = time;
-        uri[ QStringLiteral( "temporalSource" ) ] = QLatin1String( "project" )
+        uri[ QStringLiteral( "temporalSource" ) ] = QLatin1String( "project" );
       }
     }