Skip to content
Permalink
Browse files

suggested changes from the review

  • Loading branch information
Samweli authored and nyalldawson committed Feb 18, 2020
1 parent b30ccf3 commit 2517b566d1288c5f1dd38cf5b04dc18228b995ae
Showing with 325 additions and 570 deletions.
  1. +9 −0 doc/INSTALL.t2t.tmp
  2. +9 −0 doc/NEWS.t2t.tmp
  3. +2 −2 python/core/auto_generated/qgsdataprovider.sip.in
  4. +42 −0 python/core/auto_generated/qgsdataprovidertemporalcapabilities.sip.in
  5. +8 −8 python/core/auto_generated/qgsdataprovidertemporalproperties.sip.in
  6. +7 −5 python/core/auto_generated/qgsmaplayertemporalproperties.sip.in
  7. +16 −16 python/core/auto_generated/qgstemporalrangeobject.sip.in
  8. +0 −88 python/core/auto_generated/qgstemporalrangeobject.sip.in~HEAD
  9. +2 −2 python/core/auto_generated/raster/qgsrasterdataprovider.sip.in
  10. +12 −8 ...gsrasterdataprovidertemporalproperties.sip.in → qgsrasterdataprovidertemporalcapabilities.sip.in}
  11. +0 −1 python/core/auto_generated/raster/qgsrasterlayertemporalproperties.sip.in
  12. +2 −2 python/core/core_auto.sip
  13. +7 −8 ..._generated/{qgstemporallayerwidget.sip.in → raster/qgsrasterlayertemporalpropertieswidget.sip.in}
  14. +1 −1 python/gui/gui_auto.sip
  15. +4 −4 src/core/CMakeLists.txt
  16. +3 −3 src/core/qgsdataprovider.h
  17. +3 −3 src/core/{qgsdataprovidertemporalproperties.cpp → qgsdataprovidertemporalcapabilities.cpp}
  18. +10 −10 src/core/{qgsdataprovidertemporalproperties.h → qgsdataprovidertemporalcapabilities.h}
  19. +7 −5 src/core/qgsmaplayertemporalproperties.h
  20. +0 −60 src/core/qgstemporalrangeobject.cpp~HEAD
  21. +0 −63 src/core/qgstemporalrangeobject.cpp~HEAD~HEAD
  22. +18 −17 src/core/qgstemporalrangeobject.h
  23. +0 −102 src/core/qgstemporalrangeobject.h~HEAD
  24. +9 −9 src/core/raster/qgsrasterdataprovider.cpp
  25. +4 −4 src/core/raster/qgsrasterdataprovider.h
  26. +18 −18 ...ter/{qgsrasterdataprovidertemporalproperties.cpp → qgsrasterdataprovidertemporalcapabilities.cpp}
  27. +15 −11 .../raster/{qgsrasterdataprovidertemporalproperties.h → qgsrasterdataprovidertemporalcapabilities.h}
  28. +0 −2 src/core/raster/qgsrasterlayertemporalproperties.cpp
  29. +0 −1 src/core/raster/qgsrasterlayertemporalproperties.h
  30. +2 −2 src/gui/CMakeLists.txt
  31. +6 −8 src/gui/raster/qgsrasterlayerproperties.cpp
  32. +2 −2 src/gui/raster/qgsrasterlayerproperties.h
  33. +38 −39 src/gui/{qgstemporallayerwidget.cpp → raster/qgsrasterlayertemporalpropertieswidget.cpp}
  34. +45 −39 src/gui/{qgstemporallayerwidget.h → raster/qgsrasterlayertemporalpropertieswidget.h}
  35. +10 −12 src/providers/wms/qgswmscapabilities.cpp
  36. +9 −9 src/providers/wms/qgswmsprovider.cpp
  37. +0 −1 src/ui/CMakeLists.txt
  38. +3 −3 ...oralwidgets/qgstemporallayerwidgetbase.ui → raster/qgsrasterlayertemporalpropertieswidgetbase.ui}
  39. +2 −2 tests/src/core/testqgsrasterlayer.cpp
@@ -1,6 +1,10 @@
QGIS
Building QGIS from source - step by step
<<<<<<< HEAD
2020-02-24
=======
2020-02-19
>>>>>>> c81bfa2090... suggested changes from the review

%! target : html
%! style : style.css
@@ -56,8 +60,13 @@ Building QGIS from source - step by step
% End of comments
% -------------------

<<<<<<< HEAD
Last Updated: 2020-02-24
Last Change : 2020-02-24
=======
Last Updated: 2020-02-19
Last Change : 2020-02-17
>>>>>>> c81bfa2090... suggested changes from the review

%%toc

@@ -1,6 +1,10 @@
QGIS News
Change history for the QGIS Project
<<<<<<< HEAD
2020-02-24
=======
2020-02-19
>>>>>>> c81bfa2090... suggested changes from the review

%! target : html
%! style : style.css
@@ -35,6 +39,7 @@ Change history for the QGIS Project
% End of comments
% -------------------

<<<<<<< HEAD
Last Updated: 2020-02-24
Last Change : 2020-02-24

@@ -72,6 +77,10 @@ This release has following new features:
- Notable Fixes: Bug fixes by Stephen Knox
-

=======
Last Updated: 2020-02-19
Last Change : 2020-02-17
>>>>>>> c81bfa2090... suggested changes from the review

= What's new in Version 3.10 'A Coruña'? =

@@ -116,9 +116,9 @@ Gets the data source specification.
.. versionadded:: 3.0
%End

virtual QgsDataProviderTemporalProperties *temporalProperties();
virtual QgsDataProviderTemporalCapabilities *temporalCapabilities();
%Docstring
Returns data provider temporal properties. This may be ``None``, depending on the data provider.
Returns data provider temporal capabilities. This may be ``None``, depending on the data provider.

.. versionadded:: 3.14
%End
@@ -0,0 +1,42 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataprovidertemporalcapabilities.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/







class QgsDataProviderTemporalCapabilities : QgsTemporalProperty
{
%Docstring
Class for handling data providers temporal capabilities.

.. versionadded:: 3.14
%End

%TypeHeaderCode
#include "qgsdataprovidertemporalcapabilities.h"
%End
public:

QgsDataProviderTemporalCapabilities( bool enabled = false );
%Docstring
Constructor for QgsDataProviderTemporalCapabilities.
%End

virtual ~QgsDataProviderTemporalCapabilities();
};

/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataprovidertemporalcapabilities.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataprovidertemporalproperties.h *
* src/core/qgsdataprovidertemporalcapabilities.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -12,31 +12,31 @@



class QgsDataProviderTemporalProperties : QgsTemporalProperty
class QgsDataProviderTemporalCapabilities : QgsTemporalProperty
{
%Docstring
Class for handling data providers temporal properties.
Class for handling data providers temporal capabilities.

.. versionadded:: 3.14
%End

%TypeHeaderCode
#include "qgsdataprovidertemporalproperties.h"
#include "qgsdataprovidertemporalcapabilities.h"
%End
public:

QgsDataProviderTemporalProperties( bool enabled = false );
QgsDataProviderTemporalCapabilities( bool enabled = false );
%Docstring
Constructor for QgsDataProviderTemporalProperties.
Constructor for QgsDataProviderTemporalCapabilities.
%End

virtual ~QgsDataProviderTemporalProperties();
virtual ~QgsDataProviderTemporalCapabilities();
};

/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataprovidertemporalproperties.h *
* src/core/qgsdataprovidertemporalcapabilities.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -11,10 +11,14 @@




class QgsMapLayerTemporalProperties : QgsTemporalProperty
{
%Docstring
An abstract base class for handling map layer temporal properties.
Base class for storage of map layer temporal properties.

QgsMapLayerTemporalProperties expose user-configurable settings for controlling
how an individual QgsMapLayer behaves in a temporal context, e.g. while animating a map object.

.. versionadded:: 3.14
%End
@@ -27,22 +31,20 @@ An abstract base class for handling map layer temporal properties.
QgsMapLayerTemporalProperties( bool enabled = false );
%Docstring
Constructor for QgsMapLayerTemporalProperties.

The ``enabled`` argument specifies whether the temporal properties are initially enabled or not (see isActive()).
%End

virtual ~QgsMapLayerTemporalProperties();

virtual QDomElement writeXml( QDomElement &element, QDomDocument &doc, const QgsReadWriteContext &context ) = 0;
%Docstring
Writes the properties to a DOM ``element``, to be used later with readXml().
Writes map layer temporal properties to a DOM element, to be used later with readXml()

.. seealso:: :py:func:`readXml`
%End

virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context ) = 0;
%Docstring
Reads temporal properties from a DOM ``element`` previously written by writeXml().
Reads temporal properties from a DOM element previously written by writeXml()

.. seealso:: :py:func:`writeXml`
%End
@@ -10,10 +10,11 @@




class QgsTemporalRangeObject
{
%Docstring
Base class for objects with an associated (optional) temporal range.
Base class for temporal based classes.

.. versionadded:: 3.14
%End
@@ -23,11 +24,14 @@ Base class for objects with an associated (optional) temporal range.
%End
public:

QgsTemporalRangeObject( bool enabled = false );
QgsTemporalRangeObject();
%Docstring
Constructor QgsTemporalRangeObject.
Constructor for QgsTemporalRangeObject.
%End

The ``enabled`` argument specifies whether the temporal range is initially enabled or not (see isTemporal()).
QgsTemporalRangeObject( bool enabled );
%Docstring
Creates temporal range object with the specified temporal state.
%End

QgsTemporalRangeObject( const QgsRenderContext &rh );
@@ -39,38 +43,34 @@ Copies render context temporal members

void setIsTemporal( bool enabled );
%Docstring
Sets whether the temporal range is ``enabled`` (i.e. whether the object has a temporal range
which will be considered when rendering maps with a specific time range set.)
Sets object as a temporal based one, which will be considered when rendering maps with a specific time range set.

.. seealso:: :py:func:`isTemporal`
%End

bool isTemporal() const;
%Docstring
Returns ``True`` if the object's temporal range is enabled, and the object will be filtered when rendering maps with a specific time range set.
Returns true if the object is a temporal one, and will be filtered when rendering maps with a specific time range set.

For map settings, if ``False`` is returned, then any other temporal settings relating to the map will be ignored during rendering.
For map settings, If false is returned, then any other temporal settings relating to the map will be ignored during rendering.

.. seealso:: :py:func:`setIsTemporal`
%End

void setTemporalRange( const QgsDateTimeRange &range );
void setTemporalRange( const QgsDateTimeRange &dateTimeRange );
%Docstring
Sets the temporal ``range`` for the object.
Set datetime range for a temporal object.

Calling setTemporalRange() automatically enables temporal properties on the
object (see isTemporal()), regardless of its existing state.
It updates object temporal state to true if it was false.

When a temporal ``range`` is set it can be used to filter and request time base objects.
When set, can be used to filter and request time base objects.

.. seealso:: :py:func:`temporalRange`
%End

const QgsDateTimeRange &temporalRange() const;
%Docstring
Returns the datetime range for the object.

This should only be considered when isTemporal() returns ``True``.
Returns datetime range if object is a temporal object.

.. seealso:: :py:func:`setTemporalRange`
%End

This file was deleted.

@@ -193,9 +193,9 @@ Returns the sublayers of this layer - useful for providers that manage
their own layers, such as WMS
%End

virtual QgsRasterDataProviderTemporalProperties *temporalProperties();
virtual QgsRasterDataProviderTemporalCapabilities *temporalCapabilities();
%Docstring
Returns temporal properties associated with data provider.
Returns temporal capabilities associated with the data provider.
%End

virtual bool supportsLegendGraphic() const;

0 comments on commit 2517b56

Please sign in to comment.
You can’t perform that action at this time.