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

Remove temporary layers (highlight layers and external wms layers)

Browse Source
This commit is contained in:
Marco Hugentobler 2017-10-17 14:53:55 +02:00
parent 40201b2ef5
commit 2dda2abc98
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/services/wms/qgswmsrenderer.cpp
View File

@ -132,6 +132,11 @@ namespace QgsWms
initNicknameLayers(); initNicknameLayers();
} }
QgsRenderer::~QgsRenderer()
{
removeTemporaryLayers();
}
QImage *QgsRenderer::getLegendGraphics() QImage *QgsRenderer::getLegendGraphics()
{ {
@ -2557,6 +2562,7 @@ namespace QgsWms
} }
} }
mTemporaryLayers.append( highlightLayers );
return highlightLayers; return highlightLayers;
} }
@ -2602,7 +2608,7 @@ namespace QgsWms
return layers; return layers;
} }
QList<QgsMapLayer *> QgsRenderer::stylizedLayers( const QList<QgsWmsParametersLayer> &params ) const QList<QgsMapLayer *> QgsRenderer::stylizedLayers( const QList<QgsWmsParametersLayer> &params )
{ {
QList<QgsMapLayer *> layers; QList<QgsMapLayer *> layers;
@ -2618,6 +2624,7 @@ namespace QgsWms
if ( externalWMSLayer ) if ( externalWMSLayer )
{ {
layers.append( externalWMSLayer ); layers.append( externalWMSLayer );
mTemporaryLayers.append( externalWMSLayer );
} }
} }
else if ( mNicknameLayers.contains( nickname ) && !mRestrictedLayers.contains( nickname ) ) else if ( mNicknameLayers.contains( nickname ) && !mRestrictedLayers.contains( nickname ) )
@ -2672,6 +2679,12 @@ namespace QgsWms
return wmsLayer; return wmsLayer;
} }
void QgsRenderer::removeTemporaryLayers()
{
qDeleteAll( mTemporaryLayers );
mTemporaryLayers.clear();
}
QPainter *QgsRenderer::layersRendering( const QgsMapSettings &mapSettings, QImage &image, HitTest *hitTest ) const QPainter *QgsRenderer::layersRendering( const QgsMapSettings &mapSettings, QImage &image, HitTest *hitTest ) const
{ {
QPainter *painter = nullptr; QPainter *painter = nullptr;

7
src/server/services/wms/qgswmsrenderer.h
View File

@ -84,6 +84,8 @@ namespace QgsWms
const QgsProject *project, const QgsProject *project,
const QgsServerRequest::Parameters &parameters ); const QgsServerRequest::Parameters &parameters );
~QgsRenderer();
/** /**
* Returns the map legend as an image (or a null pointer in case of error). The caller takes ownership * Returns the map legend as an image (or a null pointer in case of error). The caller takes ownership
of the image object*/ of the image object*/
@ -154,7 +156,7 @@ namespace QgsWms
void annotationsRendering( QPainter *painter ) const; void annotationsRendering( QPainter *painter ) const;
// Return a list of layers stylized with LAYERS/STYLES parameters // Return a list of layers stylized with LAYERS/STYLES parameters
QList<QgsMapLayer *> stylizedLayers( const QList<QgsWmsParametersLayer> &params ) const; QList<QgsMapLayer *> stylizedLayers( const QList<QgsWmsParametersLayer> &params );
// Return a list of layers stylized with SLD parameter // Return a list of layers stylized with SLD parameter
QList<QgsMapLayer *> sldStylizedLayers( const QString &sld ) const; QList<QgsMapLayer *> sldStylizedLayers( const QString &sld ) const;
@ -277,6 +279,8 @@ namespace QgsWms
//! Creates external WMS layer. Caller takes ownership //! Creates external WMS layer. Caller takes ownership
QgsMapLayer *createExternalWMSLayer( const QString &externalLayerId ) const; QgsMapLayer *createExternalWMSLayer( const QString &externalLayerId ) const;
void removeTemporaryLayers();
private: private:
const QgsServerRequest::Parameters &mParameters; const QgsServerRequest::Parameters &mParameters;
@ -289,6 +293,7 @@ namespace QgsWms
QgsWmsParameters mWmsParameters; QgsWmsParameters mWmsParameters;
QStringList mRestrictedLayers; QStringList mRestrictedLayers;
QMap<QString, QgsMapLayer *> mNicknameLayers; QMap<QString, QgsMapLayer *> mNicknameLayers;
QList<QgsMapLayer *> mTemporaryLayers;
public: public: