From d9926a9f91e7aa3989d1981e5cad033ddf9fa845 Mon Sep 17 00:00:00 2001 From: Samweli Date: Fri, 7 Feb 2020 16:59:26 +0300 Subject: [PATCH] fix travis tests --- .../qgsrasterlayertemporalproperties.sip.in | 8 +++---- python/gui/auto_generated/qgsmapcanvas.sip.in | 1 + .../raster/qgsrasterlayertemporalproperties.h | 24 ++++++++++--------- src/gui/qgsmapcanvas.h | 3 ++- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in b/python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in index 47548aa45f0..fc4d1da9e6b 100644 --- a/python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in +++ b/python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in @@ -40,14 +40,14 @@ Constructor for QgsRasterLayerTemporalProperties. TemporalMode mode() const; %Docstring -Return the temporal properties mode +Returns the temporal properties mode .. seealso:: :py:func:`setMode` %End void setMode( TemporalMode mode ); %Docstring -Set the temporal properties mode +Sets the temporal properties mode .. seealso:: :py:func:`mode` %End @@ -71,7 +71,7 @@ of the render context will be fetched. const QgsDateTimeRange &fixedTemporalRange() const; %Docstring -Return fixed temporal range for these properties +Returns the fixed temporal range for these properties .. warning:: @@ -83,7 +83,7 @@ Return fixed temporal range for these properties void setWmstRelatedSettings( const QString &dimension ); %Docstring -Set this raster layer properties with WMS-T temporal settings. +Sets the raster layer properties with WMS-T temporal settings. .. warning:: diff --git a/python/gui/auto_generated/qgsmapcanvas.sip.in b/python/gui/auto_generated/qgsmapcanvas.sip.in index 6259e865684..96e8adf22f6 100644 --- a/python/gui/auto_generated/qgsmapcanvas.sip.in +++ b/python/gui/auto_generated/qgsmapcanvas.sip.in @@ -1048,6 +1048,7 @@ start of the pan and the current pan position. Emitted whenever a tap and hold ``gesture`` occurs at the specified map point. .. versionadded:: 3.12 +%End void temporalRangeChanged(); %Docstring diff --git a/src/core/raster/qgsrasterlayertemporalproperties.h b/src/core/raster/qgsrasterlayertemporalproperties.h index ec3dbbdc3f3..27c4f4824ee 100644 --- a/src/core/raster/qgsrasterlayertemporalproperties.h +++ b/src/core/raster/qgsrasterlayertemporalproperties.h @@ -43,22 +43,26 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP virtual ~QgsRasterLayerTemporalProperties() = default; + /** + * Mode of the raster temporal properties + * + **/ enum TemporalMode { - ModeFixedTemporalRange, - ModeTemporalRangeFromDataProvider, - ModeTemporalRangesList + ModeFixedTemporalRange, //! Mode when temporal properties have fixed start and end datetimes. + ModeTemporalRangeFromDataProvider, //! Mode when raster layer depends on temporal range from its dataprovider. + ModeTemporalRangesList //! To be used when raster layer has list of temporal ranges. }; /** - * Return the temporal properties mode + * Returns the temporal properties mode * *\see setMode() **/ TemporalMode mode() const; /** - * Set the temporal properties mode + * Sets the temporal properties mode * *\see mode() **/ @@ -80,7 +84,7 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP void setFixedTemporalRange( const QgsDateTimeRange &range ); /** - * Return fixed temporal range for these properties + * Returns the fixed temporal range for these properties * * \warning To be used only when mode() is * QgsRasterLayerTemporalProperties::ModeFixedTemporalRange @@ -90,7 +94,7 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP const QgsDateTimeRange &fixedTemporalRange() const; /** - * Set this raster layer properties with WMS-T temporal settings. + * Sets the raster layer properties with WMS-T temporal settings. * * \warning This is to be used to support WMS-T layers only. Applicable when * TemporalMode is QgsRasterLayerTemporalProperties::ModeFixedTemporalRange or @@ -112,11 +116,9 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP QgsDateTimeRange mRange; /** - * Returns Temporal mode given index + * Returns the temporal mode given index * - * - * - */ + **/ TemporalMode indexToMode( int index ); }; diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h index 45bfeae4c24..3cb6fcbb712 100644 --- a/src/gui/qgsmapcanvas.h +++ b/src/gui/qgsmapcanvas.h @@ -941,7 +941,8 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView */ void tapAndHoldGestureOccurred( const QgsPointXY &mapPoint, QTapAndHoldGesture *gesture ); - /** Emitted when the map canvas temporal range changes. + /** + * Emitted when the map canvas temporal range changes. * * \since QGIS 3.14 */