Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUGFIX][Server] In GetPrint, legend as to be fixed when it is not auto update or filter by map #7232

Merged
merged 1 commit into from
Jun 21, 2018
Merged

[BUGFIX][Server] In GetPrint, legend as to be fixed when it is not auto update or filter by map #7232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/server/qgswmsprojectparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,30 @@ QgsComposition* QgsWMSProjectParser::initComposition( const QString& composerTem
return nullptr;
}

// load layers for legends before loaded legends
const QHash< QString, QDomElement > &projectLayerElements = mProjectParser->projectLayerElementsById();
QDomNodeList treeLayerNodeList = compositionElem.elementsByTagName( "layer-tree-layer" );
for ( int i = 0; i < treeLayerNodeList.size(); ++i )
{
QDomElement treeLayerElem = treeLayerNodeList.at( i ).toElement();
QString layerId = treeLayerElem.attribute( "id" );
QgsMapLayer * layer = QgsMapLayerRegistry::instance()->mapLayer( layerId );
if ( layer )
{
continue;
}

QHash< QString, QDomElement >::const_iterator layerElemIt = projectLayerElements.find( layerId );
if ( layerElemIt != projectLayerElements.constEnd() )
{
layer = mProjectParser->createLayerFromElement( layerElemIt.value(), true );
}
if ( layer )
{
QgsMapLayerRegistry::instance()->addMapLayer( layer );
}
}

composition->addItemsFromXML( compositionElem, *( mProjectParser->xmlDocument() ) );

labelList.clear();
Expand Down Expand Up @@ -527,11 +551,12 @@ QgsComposition* QgsWMSProjectParser::initComposition( const QString& composerTem
if ( legend->autoUpdateModel() )
{
model->setRootGroup( projectLayerTreeGroup() );
legend->synchronizeWithModel();
}
// if the legend has no map
// we will load all layers
const QgsComposerMap* map = legend->composerMap();
if ( !map )
if ( !map || ( !legend->autoUpdateModel() && !legend->legendFilterByMapEnabled() ) )
{
QgsLayerTreeGroup* root = model->rootGroup();
QStringList layerIds = root->findLayerIds();
Expand All @@ -553,7 +578,6 @@ QgsComposition* QgsWMSProjectParser::initComposition( const QString& composerTem
layer = nodeLayer->layer();
if ( !layer )
{
const QHash< QString, QDomElement > &projectLayerElements = mProjectParser->projectLayerElementsById();
QHash< QString, QDomElement >::const_iterator layerElemIt = projectLayerElements.find( layerId );
if ( layerElemIt != projectLayerElements.constEnd() )
{
Expand Down Expand Up @@ -2387,6 +2411,7 @@ QgsLayerTreeGroup* QgsWMSProjectParser::projectLayerTreeGroup() const
QgsLayerTreeUtils::readOldLegend( rootGroup, mProjectParser->legendElem() );
return rootGroup;
}

return QgsLayerTreeGroup::readXML( layerTreeElem );
}

Expand Down