Set visibility of layers for embedded groups (ticket #4097)

mhugent · mhugent · commit d02c4bef94be · 2011-07-21T10:10:59.000+02:00
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -697,6 +697,7 @@ QgsLegendGroup* QgsLegend::addEmbeddedGroup( const QString& groupName, const QSt
       for ( int j = 0; j < groupChildren.size(); ++j )
       {
         QDomElement childElem = groupChildren.at( j ).toElement();
+        bool visible = ( childElem.attribute( "checked" ).compare( "Qt::Checked", Qt::CaseInsensitive ) == 0 );
         QString tagName = childElem.tagName();
         if ( tagName == "legendlayer" )
         {
@@ -717,6 +718,11 @@ QgsLegendGroup* QgsLegend::addEmbeddedGroup( const QString& groupName, const QSt
           {
             group->insertChild( group->childCount(), cItem );
           }
+
+          if( !visible )
+          {
+            cItem->setCheckState( 0, Qt::Unchecked );
+          }
         }
         else if ( tagName == "legendgroup" )
         {
@@ -1175,6 +1181,7 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )
       if ( childelem.attribute( "embedded" ) == "1" )
       {
         theGroup = addEmbeddedGroup( name, QgsProject::instance()->readPath( childelem.attribute( "project" ) ) );
+        updateGroupCheckStates( theGroup );
       }
       else
       {

Original file line number	Diff line number	Diff line change
`@@ -697,6 +697,7 @@ QgsLegendGroup* QgsLegend::addEmbeddedGroup( const QString& groupName, const QSt`
`697`	`697`	`for ( int j = 0; j < groupChildren.size(); ++j )`
`698`	`698`	`{`
`699`	`699`	`QDomElement childElem = groupChildren.at( j ).toElement();`
	`700`	`+ bool visible = ( childElem.attribute( "checked" ).compare( "Qt::Checked", Qt::CaseInsensitive ) == 0 );`
`700`	`701`	`QString tagName = childElem.tagName();`
`701`	`702`	`if ( tagName == "legendlayer" )`
`702`	`703`	`{`
`@@ -717,6 +718,11 @@ QgsLegendGroup* QgsLegend::addEmbeddedGroup( const QString& groupName, const QSt`
`717`	`718`	`{`
`718`	`719`	`group->insertChild( group->childCount(), cItem );`
`719`	`720`	`}`
	`721`	`+`
	`722`	`+ if( !visible )`
	`723`	`+ {`
	`724`	`+ cItem->setCheckState( 0, Qt::Unchecked );`
	`725`	`+ }`
`720`	`726`	`}`
`721`	`727`	`else if ( tagName == "legendgroup" )`
`722`	`728`	`{`
`@@ -1175,6 +1181,7 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )`
`1175`	`1181`	`if ( childelem.attribute( "embedded" ) == "1" )`
`1176`	`1182`	`{`
`1177`	`1183`	`theGroup = addEmbeddedGroup( name, QgsProject::instance()->readPath( childelem.attribute( "project" ) ) );`
	`1184`	`+ updateGroupCheckStates( theGroup );`
`1178`	`1185`	`}`
`1179`	`1186`	`else`
`1180`	`1187`	`{`