Minor API tweak

qgis · Mar 13, 2020 · ee2b94f · ee2b94f
1 parent ea16cc7
commit ee2b94f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 24 deletions.
diff --git a/python/core/auto_generated/qgsmaplayertemporalproperties.sip.in b/python/core/auto_generated/qgsmaplayertemporalproperties.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsMapLayerTemporalProperties : QgsTemporalProperty
 {
 %Docstring
@@ -71,6 +72,12 @@ Sets the temporal properties temporal range ``source``.
     virtual bool isVisibleInTemporalRange( const QgsDateTimeRange &range ) const;
 %Docstring
 Returns ``True`` if the layer should be visible and rendered for the specified time ``range``.
+%End
+
+    virtual void setDefaultsFromDataProviderTemporalCapabilities( const QgsDataProviderTemporalCapabilities *capabilities ) = 0;
+%Docstring
+Sets the layers temporal settings to appropriate defaults based on
+a provider's temporal ``capabilities``.
 %End
 
 };

diff --git a/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in b/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in
@@ -195,9 +195,6 @@ their own layers, such as WMS
 
     virtual QgsRasterDataProviderTemporalCapabilities *temporalCapabilities();
 
-%Docstring
-Returns temporal capabilities associated with the data provider.
-%End
 
     virtual bool supportsLegendGraphic() const;
 %Docstring

diff --git a/python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in b/python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in
@@ -165,11 +165,8 @@ Returns the current active reference datetime range for these temporal propertie
     virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context );
 
 
-    void setDefaultsFromDataProviderTemporalCapabilities( QgsRasterDataProviderTemporalCapabilities *capabilities );
-%Docstring
-Sets the layers temporal settings to appropriate defaults based on
-a provider's temporal ``capabilities``.
-%End
+    virtual void setDefaultsFromDataProviderTemporalCapabilities( const QgsDataProviderTemporalCapabilities *capabilities );
+
 
 };
 

diff --git a/src/core/qgsmaplayertemporalproperties.h b/src/core/qgsmaplayertemporalproperties.h
@@ -27,6 +27,8 @@
 
 #include <QDomElement>
 
+class QgsDataProviderTemporalCapabilities;
+
 /**
  * \class QgsMapLayerTemporalProperties
  * \ingroup core
@@ -92,6 +94,12 @@ class CORE_EXPORT QgsMapLayerTemporalProperties : public QgsTemporalProperty
      */
     virtual bool isVisibleInTemporalRange( const QgsDateTimeRange &range ) const;
 
+    /**
+     * Sets the layers temporal settings to appropriate defaults based on
+     * a provider's temporal \a capabilities.
+     */
+    virtual void setDefaultsFromDataProviderTemporalCapabilities( const QgsDataProviderTemporalCapabilities *capabilities ) = 0;
+
   private:
 
     //! Source of the properties temporal range

diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h
@@ -261,9 +261,6 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
       return QStringList();
     }
 
-    /**
-     * Returns temporal capabilities associated with the data provider.
-     */
     QgsRasterDataProviderTemporalCapabilities *temporalCapabilities() override;
 
     //! \brief Returns whether the provider supplies a legend graphic

diff --git a/src/core/raster/qgsrasterlayertemporalproperties.cpp b/src/core/raster/qgsrasterlayertemporalproperties.cpp
@@ -199,15 +199,18 @@ QDomElement QgsRasterLayerTemporalProperties::writeXml( QDomElement &element, QD
   return element;
 }
 
-void QgsRasterLayerTemporalProperties::setDefaultsFromDataProviderTemporalCapabilities( QgsRasterDataProviderTemporalCapabilities *capabilities )
+void QgsRasterLayerTemporalProperties::setDefaultsFromDataProviderTemporalCapabilities( const QgsDataProviderTemporalCapabilities *capabilities )
 {
-  setFixedTemporalRange( capabilities->availableTemporalRange() );
-  setFixedReferenceTemporalRange( capabilities->availableReferenceTemporalRange() );
-
-  if ( capabilities->hasTemporalCapabilities() )
+  if ( const QgsRasterDataProviderTemporalCapabilities *rasterCaps = dynamic_cast< const QgsRasterDataProviderTemporalCapabilities *>( capabilities ) )
   {
-    setMode( ModeTemporalRangeFromDataProvider );
-  }
+    setFixedTemporalRange( rasterCaps->availableTemporalRange() );
+    setFixedReferenceTemporalRange( rasterCaps->availableReferenceTemporalRange() );
 
-  mIntervalHandlingMethod = capabilities->intervalHandlingMethod();
+    if ( rasterCaps->hasTemporalCapabilities() )
+    {
+      setMode( ModeTemporalRangeFromDataProvider );
+    }
+
+    mIntervalHandlingMethod = rasterCaps->intervalHandlingMethod();
+  }
 }
diff --git a/src/core/raster/qgsrasterlayertemporalproperties.h b/src/core/raster/qgsrasterlayertemporalproperties.h
@@ -168,11 +168,7 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP
 
     bool readXml( const QDomElement &element, const QgsReadWriteContext &context ) override;
 
-    /**
-     * Sets the layers temporal settings to appropriate defaults based on
-     * a provider's temporal \a capabilities.
-     */
-    void setDefaultsFromDataProviderTemporalCapabilities( QgsRasterDataProviderTemporalCapabilities *capabilities );
+    void setDefaultsFromDataProviderTemporalCapabilities( const QgsDataProviderTemporalCapabilities *capabilities ) override;
 
   private: