Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Server] GetLegendGraphics refactoring
  • Loading branch information
pblottiere committed Jun 9, 2017
1 parent f80a1f5 commit dae8447
Show file tree
Hide file tree
Showing 6 changed files with 1,034 additions and 505 deletions.
14 changes: 3 additions & 11 deletions src/server/services/wms/qgslayerrestorer.cpp
Expand Up @@ -21,24 +21,15 @@
#include "qgsrasterrenderer.h"
#include "qgsmaplayerstylemanager.h"

const QString DEFAULT_NAMED_STYLE = "server_default_style";

QgsLayerRestorer::QgsLayerRestorer( const QList<QgsMapLayer *> &layers )
{
Q_FOREACH ( QgsMapLayer *layer, layers )
{
QgsLayerSettings settings;
settings.name = layer->name();

QString style = layer->styleManager()->currentStyle();
if ( style.isEmpty() )
{
layer->styleManager()->addStyleFromLayer( DEFAULT_NAMED_STYLE );
settings.mNamedStyle = DEFAULT_NAMED_STYLE;
}
else
{
settings.mNamedStyle = style;
}
settings.mNamedStyle = layer->styleManager()->currentStyle();

// set a custom property allowing to keep in memory if a SLD file has
// been loaded for rendering
Expand Down Expand Up @@ -80,6 +71,7 @@ QgsLayerRestorer::~QgsLayerRestorer()
{
QgsLayerSettings settings = mLayerSettings[layer];
layer->styleManager()->setCurrentStyle( settings.mNamedStyle );
layer->setName( mLayerSettings[layer].name );

// if a SLD file has been loaded for rendering, we restore the previous one
QString errMsg;
Expand Down
1 change: 1 addition & 0 deletions src/server/services/wms/qgslayerrestorer.h
Expand Up @@ -30,6 +30,7 @@ class QgsLayerRestorer
{
struct QgsLayerSettings
{
QString name;
double mOpacity;
QString mNamedStyle;
QDomDocument mSldStyle;
Expand Down

0 comments on commit dae8447

Please sign in to comment.