Skip to content

Commit

Permalink
fix travis tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Samweli committed Feb 8, 2020
1 parent c4355ab commit d9926a9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
Expand Up @@ -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
Expand All @@ -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::

Expand All @@ -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::

Expand Down
1 change: 1 addition & 0 deletions python/gui/auto_generated/qgsmapcanvas.sip.in
Expand Up @@ -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
Expand Down
24 changes: 13 additions & 11 deletions src/core/raster/qgsrasterlayertemporalproperties.h
Expand Up @@ -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()
**/
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 );
};

Expand Down
3 changes: 2 additions & 1 deletion src/gui/qgsmapcanvas.h
Expand Up @@ -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
*/
Expand Down

0 comments on commit d9926a9

Please sign in to comment.