Skip to content
Permalink
Browse files

Merge pull request #3809 from pblottiere/render

replace QgsMapRenderer
  • Loading branch information
rldhont committed Dec 12, 2016
2 parents 29a05df + 8cda1bb commit 7028eee198d3101f40b7234e505a6c555533382c
Showing with 3,444 additions and 4,153 deletions.
  1. +7 −0 python/core/qgsdatumtransformstore.sip
  2. +12 −0 python/core/qgsmaprendererjob.sip
  3. +0 −278 python/server/qgsmaprenderer.sip
  4. +1 −1 python/server/qgsserverprojectparser.sip
  5. +0 −1 python/server/qgswfserver.sip
  6. +6 −9 python/server/qgswmsconfigparser.sip
  7. +5 −4 python/server/qgswmserver.sip
  8. +5 −5 python/server/qgswmsprojectparser.sip
  9. +0 −1 python/server/server.sip
  10. +4 −0 src/core/qgsmaprendererjob.cpp
  11. +15 −1 src/core/qgsmaprendererjob.h
  12. +1 −3 src/server/CMakeLists.txt
  13. +0 −1,154 src/server/qgsmaprenderer.cpp
  14. +0 −395 src/server/qgsmaprenderer.h
  15. +4 −4 src/server/{qgsmsutils.cpp → qgsmapserverutils.cpp}
  16. +4 −4 src/server/{qgsmsutils.h → qgsmapserverutils.h}
  17. +1 −10 src/server/qgsserver.cpp
  18. +1 −2 src/server/qgsserver.h
  19. +0 −1 src/server/qgsserverinterfaceimpl.h
  20. +1 −1 src/server/qgsserverplugins.cpp
  21. +4 −4 src/server/qgsserverprojectparser.cpp
  22. +2 −2 src/server/qgsserverprojectparser.h
  23. +10 −19 src/server/qgssldconfigparser.cpp
  24. +7 −7 src/server/qgssldconfigparser.h
  25. +0 −1 src/server/qgswfsserver.cpp
  26. +0 −1 src/server/qgswfsserver.h
  27. +4 −9 src/server/qgswmsconfigparser.cpp
  28. +12 −12 src/server/qgswmsconfigparser.h
  29. +79 −67 src/server/qgswmsprojectparser.cpp
  30. +8 −5 src/server/qgswmsprojectparser.h
  31. +139 −165 src/server/qgswmsserver.cpp
  32. +22 −18 src/server/qgswmsserver.h
  33. +356 −5 tests/src/python/test_qgsserver.py
  34. BIN tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox/WMS_GetLegendGraphic_BBox.png
  35. BIN tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_BBox2/WMS_GetLegendGraphic_BBox2.png
  36. BIN tests/testdata/control_images/qgis_server/WMS_GetLegendGraphic_Basic/WMS_GetLegendGraphic_Basic.png
  37. BIN ...stdata/control_images/qgis_server/WMS_GetLegendGraphic_BoxSpace/WMS_GetLegendGraphic_BoxSpace.png
  38. BIN ...ol_images/qgis_server/WMS_GetLegendGraphic_IconLabelSpace/WMS_GetLegendGraphic_IconLabelSpace.png
  39. BIN ...ta/control_images/qgis_server/WMS_GetLegendGraphic_SymbolSize/WMS_GetLegendGraphic_SymbolSize.png
  40. BIN .../control_images/qgis_server/WMS_GetLegendGraphic_SymbolSpace/WMS_GetLegendGraphic_SymbolSpace.png
  41. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_Filter/WMS_GetMap_Filter.png
  42. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_LayerOrder/WMS_GetMap_LayerOrder.png
  43. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_Opacities/WMS_GetMap_Opacities.png
  44. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_SRS/WMS_GetMap_SRS.png
  45. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_Selection/WMS_GetMap_Selection.png
  46. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom.png
  47. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom_mask.png
  48. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_StyleDefault/WMS_GetMap_StyleDefault.png
  49. BIN tests/testdata/control_images/qgis_server/WMS_GetMap_StyleDefault/WMS_GetMap_StyleDefault_mask.png
  50. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Basic/WMS_GetPrint_Basic.png
  51. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Basic/WMS_GetPrint_Basic_mask.png
  52. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Grid/WMS_GetPrint_Grid.png
  53. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Grid/WMS_GetPrint_Grid_mask.png
  54. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Rotation/WMS_GetPrint_Rotation.png
  55. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Rotation/WMS_GetPrint_Rotation_mask.png
  56. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_SRS/WMS_GetPrint_SRS.png
  57. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_SRS/WMS_GetPrint_SRS_mask.png
  58. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Scale/WMS_GetPrint_Scale.png
  59. BIN tests/testdata/control_images/qgis_server/WMS_GetPrint_Scale/WMS_GetPrint_Scale_mask.png
  60. +2,734 −1,964 tests/testdata/qgis_server_accesscontrol/project.qgs
@@ -33,4 +33,11 @@ class QgsDatumTransformStore

void writeXml( QDomNode& parentNode, QDomDocument& theDoc ) const;

struct Entry
{
QString srcAuthId;
QString destAuthId;
int srcDatumTransform; //-1 if unknown or not specified
int destDatumTransform;
};
};
@@ -65,6 +65,18 @@ class QgsMapRendererJob : QObject
//! Get pointer to internal labeling engine (in order to get access to the results)
virtual QgsLabelingResults* takeLabelingResults() = 0 /Transfer/;

//! @note Added in QGIS 3.0
//! Set the feature filter provider used by the QgsRenderContext of
//! each LayerRenderJob.
//! Ownership is not transferred and the provider must not be deleted
//! before the render job.
void setFeatureFilterProvider( const QgsFeatureFilterProvider *f );

//! @note Added in QGIS 3.0
//! Returns the feature filter provider used by the QgsRenderContext of
//! each LayerRenderJob.
const QgsFeatureFilterProvider* featureFilterProvider() const;

struct Error
{
Error( const QString& lid, const QString& msg );

This file was deleted.

@@ -86,7 +86,7 @@ class QgsServerProjectParser

QList<QDomElement> publishedComposerElements() const;

//QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const;
//QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;

/** Returns the text of the <layername> element for a layer element
@return id or a null string in case of error*/
@@ -33,7 +33,6 @@ class QgsComposerLegendItem;
class QgsComposition;
class QgsFields;
class QgsMapLayer;
class QgsMapRenderer;
class QgsPoint;
class QgsRasterLayer;
class QgsConfigParser;
@@ -45,7 +45,7 @@ class QgsWmsConfigParser
virtual QDomDocument describeLayer( QStringList& layerList, const QString& hrefString ) const = 0;

/** Returns if output are MM or PIXEL*/
virtual QgsMapRenderer::OutputUnits outputUnits() const = 0;
virtual QgsUnitTypes::RenderUnit outputUnits() const = 0;

/** Returns an ID-list of layers which are not queryable (comes from <properties> -> <Identify> -> <disabledLayers in the project file*/
virtual QStringList identifyDisabledLayers() const = 0;
@@ -71,8 +71,8 @@ class QgsWmsConfigParser
/** Draw text annotation items from the QGIS projectfile*/
virtual void drawOverlays( QPainter* p, int dpi, int width, int height ) const = 0;

/** Load PAL engine settings from the QGIS projectfile*/
virtual void loadLabelSettings( QgsLabelingEngineInterface* lbl ) const = 0;
/** Load PAL engine settings into global project instance*/
virtual void loadLabelSettings() const = 0;

virtual QString serviceUrl() const = 0;

@@ -101,21 +101,18 @@ class QgsWmsConfigParser
//printing

/** Creates a print composition, usually for a GetPrint request. Replaces map and label parameters*/
QgsComposition* createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const;

/** Creates a print composition, usually for a GetPrint request. Replaces map and label parameters*/
QgsComposition* createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap, QStringList& highlightLayers ) const;
QgsComposition* createPrintComposition( const QString& composerTemplate, const QgsMapSettings& mapSettings, const QMap< QString, QString >& parameterMap, QStringList& highlightLayers ) const;

/** Creates a composition from the project file (probably delegated to the fallback parser)*/
//virtual QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap*>& mapList /Out/, QList< QgsComposerLegend* >& legendList /Out/, QList< QgsComposerLabel* >& labelList /Out/, QList<const QgsComposerHtml *>& htmlFrameList /Out/ ) const = 0;
//virtual QgsComposition* initComposition( const QString& composerTemplate, const QgsMapSettings& mapSettings, QList< QgsComposerMap*>& mapList, QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const = 0;

/** Adds print capabilities to xml document. ParentElem usually is the <Capabilities> element*/
virtual void printCapabilities( QDomElement& parentElement, QDomDocument& doc ) const = 0;

virtual void setScaleDenominator( double denom ) = 0;
virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0;

virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0;

virtual int nLayers() const = 0;

0 comments on commit 7028eee

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