sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-07 00:03:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix travis tests

Browse Source
This commit is contained in:
Samweli 2020-02-07 16:59:26 +03:00
parent c4355ab8b7
commit d9926a9f91
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in
View File

@ -40,14 +40,14 @@ Constructor for QgsRasterLayerTemporalProperties.
TemporalMode mode() const; TemporalMode mode() const;
%Docstring %Docstring
Return the temporal properties mode Returns the temporal properties mode
.. seealso:: :py:func:`setMode` .. seealso:: :py:func:`setMode`
%End %End
void setMode( TemporalMode mode ); void setMode( TemporalMode mode );
%Docstring %Docstring
Set the temporal properties mode Sets the temporal properties mode
.. seealso:: :py:func:`mode` .. seealso:: :py:func:`mode`
%End %End
@ -71,7 +71,7 @@ of the render context will be fetched.
const QgsDateTimeRange &fixedTemporalRange() const; const QgsDateTimeRange &fixedTemporalRange() const;
%Docstring %Docstring
Return fixed temporal range for these properties Returns the fixed temporal range for these properties
.. warning:: .. warning::
@ -83,7 +83,7 @@ Return fixed temporal range for these properties
void setWmstRelatedSettings( const QString &dimension ); void setWmstRelatedSettings( const QString &dimension );
%Docstring %Docstring
Set this raster layer properties with WMS-T temporal settings. Sets the raster layer properties with WMS-T temporal settings.
.. warning:: .. warning::

1
python/gui/auto_generated/qgsmapcanvas.sip.in
View File

@ -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. Emitted whenever a tap and hold ``gesture`` occurs at the specified map point.
.. versionadded:: 3.12 .. versionadded:: 3.12
%End
void temporalRangeChanged(); void temporalRangeChanged();
%Docstring %Docstring

24
src/core/raster/qgsrasterlayertemporalproperties.h
View File

@ -43,22 +43,26 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP
virtual ~QgsRasterLayerTemporalProperties() = default; virtual ~QgsRasterLayerTemporalProperties() = default;
/**
* Mode of the raster temporal properties
*
**/
enum TemporalMode enum TemporalMode
{ {
ModeFixedTemporalRange, ModeFixedTemporalRange, //! Mode when temporal properties have fixed start and end datetimes.
ModeTemporalRangeFromDataProvider, ModeTemporalRangeFromDataProvider, //! Mode when raster layer depends on temporal range from its dataprovider.
ModeTemporalRangesList ModeTemporalRangesList //! To be used when raster layer has list of temporal ranges.
}; };
/** /**
* Return the temporal properties mode * Returns the temporal properties mode
* *
*\see setMode() *\see setMode()
**/ **/
TemporalMode mode() const; TemporalMode mode() const;
/** /**
* Set the temporal properties mode * Sets the temporal properties mode
* *
*\see mode() *\see mode()
**/ **/
@ -80,7 +84,7 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP
void setFixedTemporalRange( const QgsDateTimeRange &range ); 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 * \warning To be used only when mode() is
* QgsRasterLayerTemporalProperties::ModeFixedTemporalRange * QgsRasterLayerTemporalProperties::ModeFixedTemporalRange
@ -90,7 +94,7 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP
const QgsDateTimeRange &fixedTemporalRange() const; 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 * \warning This is to be used to support WMS-T layers only. Applicable when
* TemporalMode is QgsRasterLayerTemporalProperties::ModeFixedTemporalRange or * TemporalMode is QgsRasterLayerTemporalProperties::ModeFixedTemporalRange or
@ -112,11 +116,9 @@ class CORE_EXPORT QgsRasterLayerTemporalProperties : public QgsMapLayerTemporalP
QgsDateTimeRange mRange; QgsDateTimeRange mRange;
/** /**
* Returns Temporal mode given index * Returns the temporal mode given index
* *
* **/
*
*/
TemporalMode indexToMode( int index ); TemporalMode indexToMode( int index );
}; };

3
src/gui/qgsmapcanvas.h
View File

@ -941,7 +941,8 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
*/ */
void tapAndHoldGestureOccurred( const QgsPointXY &mapPoint, QTapAndHoldGesture *gesture ); 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 * \since QGIS 3.14
*/ */