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

Merge pull request #1462 from giohappy/master

Browse Source 
Fix 10625 reverting addDrawingOrder to previous logic
This commit is contained in:
mhugent 2014-06-19 09:11:03 +02:00
commit c05e342ab1
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/mapserver/qgswmsprojectparser.cpp
View File

@ -709,7 +709,7 @@ void QgsWMSProjectParser::addDrawingOrder( QDomElement& parentElem, QDomDocument
parentElem.appendChild( layerDrawingOrderElem ); parentElem.appendChild( layerDrawingOrderElem );
} }
void QgsWMSProjectParser::addDrawingOrder( QDomElement groupElem, bool useDrawingOrder, QMap<int, QString>& orderedLayerList ) const void QgsWMSProjectParser::addDrawingOrderEmbeddedGroup( QDomElement groupElem, bool useDrawingOrder, QMap<int, QString>& orderedLayerList ) const
{ {
if ( groupElem.isNull() ) if ( groupElem.isNull() )
{ {
@ -801,6 +801,43 @@ void QgsWMSProjectParser::addDrawingOrder( QDomElement groupElem, bool useDrawin
} }
} }
void QgsWMSProjectParser::addDrawingOrder( QDomElement elem, bool useDrawingOrder, QMap<int, QString>& orderedLayerList ) const
{
if ( elem.isNull() )
{
return;
}
if ( elem.tagName() == "legendgroup" )
{
if ( elem.attribute( "embedded" ) == "1" )
{
addDrawingOrderEmbeddedGroup( elem, useDrawingOrder, orderedLayerList );
}
else
{
QDomNodeList groupChildren = elem.childNodes();
for ( int i = 0; i < groupChildren.size(); ++i )
{
addDrawingOrder( groupChildren.at( i ).toElement(), useDrawingOrder, orderedLayerList );
}
}
}
else if ( elem.tagName() == "legendlayer" )
{
QString layerName = elem.attribute( "name" );
if ( useDrawingOrder )
{
int drawingOrder = elem.attribute( "drawingOrder", "-1" ).toInt();
orderedLayerList.insert( drawingOrder, layerName );
}
else
{
orderedLayerList.insert( orderedLayerList.size(), layerName );
}
}
}
void QgsWMSProjectParser::addLayers( QDomDocument &doc, void QgsWMSProjectParser::addLayers( QDomDocument &doc,
QDomElement &parentLayer, QDomElement &parentLayer,
const QDomElement &legendElem, const QDomElement &legendElem,

3
src/mapserver/qgswmsprojectparser.h
View File

@ -129,6 +129,9 @@ class QgsWMSProjectParser: public QgsWMSConfigParser
/**Adds drawing order info from layer element or group element (recursive)*/ /**Adds drawing order info from layer element or group element (recursive)*/
void addDrawingOrder( QDomElement groupElem, bool useDrawingOrder, QMap<int, QString>& orderedLayerList ) const; void addDrawingOrder( QDomElement groupElem, bool useDrawingOrder, QMap<int, QString>& orderedLayerList ) const;
/**Adds drawing order info from embedded layer element or embedded group element (recursive)*/
void addDrawingOrderEmbeddedGroup( QDomElement groupElem, bool useDrawingOrder, QMap<int, QString>& orderedLayerList ) const;
void addLayers( QDomDocument &doc, void addLayers( QDomDocument &doc,
QDomElement &parentLayer, QDomElement &parentLayer,
const QDomElement &legendElem, const QDomElement &legendElem,