Skip to content
Permalink
Browse files

Merge pull request #4959 from rldhont/server-wms-configparser-getprint

[Server] WMS GetPrint refactoring
  • Loading branch information
rldhont committed Sep 19, 2017
2 parents b53e986 + 388f863 commit e05f2669f534b8addd6a7410e2a1c912b68a7088
Showing with 1,658 additions and 8,313 deletions.
  1. +8 −7 python/core/qgsvectorlayer.sip
  2. +0 −11 python/server/qgsconfigcache.sip
  3. +0 −235 python/server/qgsserverprojectparser.sip
  4. +8 −0 python/server/qgsserverprojectutils.sip
  5. +0 −243 python/server/qgswmsconfigparser.sip
  6. +0 −190 python/server/qgswmsprojectparser.sip
  7. +0 −3 python/server/server_auto.sip
  8. +3 −0 src/core/layertree/qgslayertreemodel.cpp
  9. +4 −0 src/core/layertree/qgslayertreemodellegendnode.cpp
  10. +10 −7 src/core/qgsvectorlayer.cpp
  11. +7 −6 src/core/qgsvectorlayer.h
  12. +0 −4 src/server/CMakeLists.txt
  13. +2 −76 src/server/qgsconfigcache.cpp
  14. +0 −8 src/server/qgsconfigcache.h
  15. +0 −1 src/server/qgsserver.cpp
  16. +0 −1,464 src/server/qgsserverprojectparser.cpp
  17. +0 −175 src/server/qgsserverprojectparser.h
  18. +5 −0 src/server/qgsserverprojectutils.cpp
  19. +6 −0 src/server/qgsserverprojectutils.h
  20. +0 −1,345 src/server/qgssldconfigparser.cpp
  21. +0 −209 src/server/qgssldconfigparser.h
  22. +0 −598 src/server/qgswmsconfigparser.cpp
  23. +0 −169 src/server/qgswmsconfigparser.h
  24. +0 −2,452 src/server/qgswmsprojectparser.cpp
  25. +0 −180 src/server/qgswmsprojectparser.h
  26. +1 −1 src/server/services/wms/qgsdxfwriter.cpp
  27. +0 −2 src/server/services/wms/qgswmsgetcontext.cpp
  28. +1 −1 src/server/services/wms/qgswmsgetfeatureinfo.cpp
  29. +1 −1 src/server/services/wms/qgswmsgetlegendgraphics.cpp
  30. +1 −1 src/server/services/wms/qgswmsgetmap.cpp
  31. +1 −1 src/server/services/wms/qgswmsgetprint.cpp
  32. +576 −115 src/server/services/wms/qgswmsparameters.cpp
  33. +64 −5 src/server/services/wms/qgswmsparameters.h
  34. +345 −538 src/server/services/wms/qgswmsrenderer.cpp
  35. +4 −68 src/server/services/wms/qgswmsrenderer.h
  36. +0 −15 src/server/services/wms/qgswmsutils.cpp
  37. +0 −9 src/server/services/wms/qgswmsutils.h
  38. +1 −1 tests/src/python/test_qgsserver.py
  39. +232 −0 tests/src/python/test_qgsserver_wms.py
  40. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight.png
  41. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight_mask.png
  42. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_LabelRemoved/WMS_GetPrint_LabelRemoved.png
  43. BIN .../testdata/control_images/qgis_server/WMS_GetPrint_LabelRemoved/WMS_GetPrint_LabelRemoved_mask.png
  44. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_LabelUpdated/WMS_GetPrint_LabelUpdated.png
  45. BIN .../testdata/control_images/qgis_server/WMS_GetPrint_LabelUpdated/WMS_GetPrint_LabelUpdated_mask.png
  46. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Legend/WMS_GetPrint_Legend.png
  47. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Legend/WMS_GetPrint_Legend_mask.png
  48. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom.png
  49. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom_mask.png
  50. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_StyleDefault/WMS_GetPrint_StyleDefault.png
  51. BIN .../testdata/control_images/qgis_server/WMS_GetPrint_StyleDefault/WMS_GetPrint_StyleDefault_mask.png
  52. +378 −172 tests/testdata/qgis_server_accesscontrol/project.qgs
@@ -854,20 +854,21 @@ Return the provider type for this layer
.. versionadded:: 2.10
%End

bool countSymbolFeatures();
QgsVectorLayerFeatureCounter *countSymbolFeatures();
%Docstring
Count features for symbols.
The method will return immediately. You will need to connect to the
symbolFeatureCountMapChanged() signal to be notified when the freshly updated
feature counts are ready.
The method will return the feature counter task. You will need to
connect to the symbolFeatureCountMapChanged() signal to be
notified when the freshly updated feature counts are ready.

.. note::

If you need to wait for the results, create and start your own QgsVectorLayerFeatureCounter
task and call waitForFinished().
If the count features for symbols has been already done a
None is returned. If you need to wait for the results,
you can call waitForFinished() on the feature counter.

.. versionadded:: 3.0
:rtype: bool
:rtype: QgsVectorLayerFeatureCounter
%End

virtual bool setSubsetString( const QString &subset );
@@ -34,17 +34,6 @@ class QgsConfigCache : QObject
:rtype: QgsConfigCache
%End

QgsServerProjectParser *serverConfiguration( const QString &filePath );
%Docstring
:rtype: QgsServerProjectParser
%End
QgsWmsConfigParser *wmsConfiguration( const QString &filePath,
const QgsAccessControl *accessControl,
const QMap<QString, QString> &parameterMap = QMap< QString, QString >() );
%Docstring
:rtype: QgsWmsConfigParser
%End

void removeEntry( const QString &path );

const QgsProject *project( const QString &path );

This file was deleted.

@@ -129,6 +129,14 @@ namespace QgsServerProjectUtils
:rtype: int
%End

int wmsImageQuality( const QgsProject &project );
%Docstring
Returns the quality for WMS images defined in a QGIS project.
\param project the QGIS project
:return: quality if defined in project, -1 otherwise.
:rtype: int
%End

bool wmsUseLayerIds( const QgsProject &project );
%Docstring
Returns if layer ids are used as name in WMS.

0 comments on commit e05f266

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