Skip to content

Commit f3a5c98

Browse files
committed
remove QgsMapRenderer
1 parent 5228cc5 commit f3a5c98

File tree

60 files changed

+3420
-4132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3420
-4132
lines changed

python/core/qgsdatumtransformstore.sip

+7
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,11 @@ class QgsDatumTransformStore
3333

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

36+
struct Entry
37+
{
38+
QString srcAuthId;
39+
QString destAuthId;
40+
int srcDatumTransform; //-1 if unknown or not specified
41+
int destDatumTransform;
42+
};
3643
};

python/core/qgsmaprendererjob.sip

+12
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@ class QgsMapRendererJob : QObject
6565
//! Get pointer to internal labeling engine (in order to get access to the results)
6666
virtual QgsLabelingResults* takeLabelingResults() = 0 /Transfer/;
6767

68+
//! @note Added in QGIS 3.0
69+
//! Set the feature filter provider used by the QgsRenderContext of
70+
//! each LayerRenderJob.
71+
//! Ownership is not transferred and the provider must not be deleted
72+
//! before the render job.
73+
void setFeatureFilterProvider( const QgsFeatureFilterProvider *f );
74+
75+
//! @note Added in QGIS 3.0
76+
//! Returns the feature filter provider used by the QgsRenderContext of
77+
//! each LayerRenderJob.
78+
const QgsFeatureFilterProvider* featureFilterProvider() const;
79+
6880
struct Error
6981
{
7082
Error( const QString& lid, const QString& msg );

python/server/qgsmaprenderer.sip

-278
This file was deleted.

python/server/qgsserverprojectparser.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class QgsServerProjectParser
8686

8787
QList<QDomElement> publishedComposerElements() const;
8888

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

9191
/** Returns the text of the <layername> element for a layer element
9292
@return id or a null string in case of error*/

python/server/qgswfserver.sip

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class QgsComposerLegendItem;
3333
class QgsComposition;
3434
class QgsFields;
3535
class QgsMapLayer;
36-
class QgsMapRenderer;
3736
class QgsPoint;
3837
class QgsRasterLayer;
3938
class QgsConfigParser;

python/server/qgswmsconfigparser.sip

+6-9
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class QgsWmsConfigParser
4545
virtual QDomDocument describeLayer( QStringList& layerList, const QString& hrefString ) const = 0;
4646

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

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

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

7777
virtual QString serviceUrl() const = 0;
7878

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

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

109106
/** Creates a composition from the project file (probably delegated to the fallback parser)*/
110-
//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;
107+
//virtual QgsComposition* initComposition( const QString& composerTemplate, const QgsMapSettings& mapSettings, QList< QgsComposerMap*>& mapList, QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const = 0;
111108

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

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

118-
virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
115+
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0;
119116

120117
virtual int nLayers() const = 0;
121118

0 commit comments

Comments
 (0)