Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FEATURE:] Redlining in QGIS server (GetMap and GetPrint). Funded by …
…canton of Solothurn
  • Loading branch information
mhugent committed Mar 31, 2016
1 parent befa962 commit afa20ec
Show file tree
Hide file tree
Showing 6 changed files with 326 additions and 30 deletions.
2 changes: 2 additions & 0 deletions src/server/qgsowsserver.h
Expand Up @@ -25,6 +25,8 @@

#include <QHash>

class QgsMapLayer;

class QgsOWSServer
{
public:
Expand Down
4 changes: 2 additions & 2 deletions src/server/qgssldconfigparser.cpp
Expand Up @@ -717,11 +717,11 @@ bool QgsSLDConfigParser::WMSInspireActivated() const
return false;
}

QgsComposition* QgsSLDConfigParser::createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const
QgsComposition* QgsSLDConfigParser::createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap, QStringList& highlightLayers ) const
{
if ( mFallbackParser )
{
return mFallbackParser->createPrintComposition( composerTemplate, mapRenderer, parameterMap );
return mFallbackParser->createPrintComposition( composerTemplate, mapRenderer, parameterMap, highlightLayers );
}
return nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgssldconfigparser.h
Expand Up @@ -112,7 +112,7 @@ class QgsSLDConfigParser : public 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;
QgsComposition* createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap, QStringList& highlightLayers ) const;

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

4 comments on commit afa20ec

@gioman
Copy link
Contributor

@gioman gioman commented on afa20ec Apr 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How this work?

@elpaso
Copy link
Contributor

@elpaso elpaso commented on afa20ec Apr 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nyalldawson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would also be nice to see some unit tests here. There's been a lot of work done lately on adding tests to QGIS server so it would be good to add to that.

@tudorbarascu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gioman Just documented it at qgis/QGIS-Documentation#1378

Please sign in to comment.