Synchronize check states between legend and layer order widget

mhugent · mhugent · commit 32e981db00dc · 2012-11-20T11:50:16.000+01:00
diff --git a/src/app/legend/qgslayerorder.cpp b/src/app/legend/qgslayerorder.cpp
@@ -20,6 +20,8 @@
 #include "qgsmaplayer.h"
 #include "qgslogger.h"
 #include "qgslegend.h"
+#include "qgslegendgroup.h"
+#include "qgslegendlayer.h"
 #include "qgslegendlayer.h"
 #include "qgsproject.h"
 
@@ -33,10 +35,6 @@ QgsLayerOrder::QgsLayerOrder( QgsLegend *legend, QWidget * parent, const char *n
 {
   setObjectName( name );
 
-  // track visibility changed in legend
-  connect( mLegend, SIGNAL( itemChanged( QTreeWidgetItem *, int ) ),
-           this, SLOT( legendItemChanged( QTreeWidgetItem *, int ) ) );
-
   // track if legend mode changes
   connect( mLegend, SIGNAL( updateDrawingOrderChecked( bool ) ),
            this, SLOT( updateDrawingOrderChecked( bool ) ) );
@@ -114,35 +112,28 @@ QListWidgetItem *QgsLayerOrder::layerItem( QgsMapLayer *layer ) const
 
 void QgsLayerOrder::itemChanged( QListWidgetItem *item )
 {
-  QgsDebugMsg( "Entering." );
-  QgsDebugMsg( QString( "item=%1" ).arg( item ? item->text() : "(null item)" ) );
-
-  QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( item->data( Qt::UserRole ).value<QObject*>() );
-  mLegend->setLayerVisible( layer, item->checkState() == Qt::Checked );
-
+  QString name = item->text();
+  QString id = item->data( Qt::UserRole ).toString();
+  bool embeddedGroup = item->data( Qt::UserRole + 1 ).toBool();
+  if ( embeddedGroup )
+  {
+    QgsLegendGroup* grp = mLegend->findLegendGroup( name, id );
+    if ( grp )
+    {
+      grp->setCheckState( 0, item->checkState() );
+    }
+  }
+  else
+  {
+    QgsLegendLayer* ll = mLegend->findLegendLayer( id );
+    if ( ll )
+    {
+      ll->setCheckState( 0, item->checkState() );
+    }
+  }
   updateLayerOrder();
 }
 
-void QgsLayerOrder::legendItemChanged( QTreeWidgetItem *item, int col )
-{
-  QgsDebugMsg( "Entering." );
-
-  if ( col != 0 )
-    return;
-
-  QgsDebugMsg( QString( "legendItem changed=%1" ).arg( item ? item->text( 0 ) : "(null item)" ) );
-
-  QgsLegendLayer *ll = dynamic_cast< QgsLegendLayer * >( item );
-  if ( !ll )
-    return;
-
-  QListWidgetItem *lwi = layerItem( ll->layer() );
-  if ( !lwi )
-    return;
-
-  lwi->setCheckState( item->checkState( col ) );
-}
-
 void QgsLayerOrder::mousePressEvent( QMouseEvent * e )
 {
   QgsDebugMsg( "Entering." );
diff --git a/src/app/legend/qgslayerorder.h b/src/app/legend/qgslayerorder.h
@@ -48,7 +48,6 @@ class QgsLayerOrder : public QListWidget
   private slots:
     void updateDrawingOrderChecked( bool );
     void itemChanged( QListWidgetItem * );
-    void legendItemChanged( QTreeWidgetItem *, int );
     void refreshLayerList();
 
   private:
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -1193,7 +1193,7 @@ QList<DrawingOrderInfo> QgsLegend::drawingOrder()
         DrawingOrderInfo dInfo;
         dInfo.name = lgroup->text( 0 );
         dInfo.id = lgroup->projectPath();
-        dInfo.checked = ( lgroup->checkState( 0 ) == Qt::Checked );
+        dInfo.checked = ( lgroup->checkState( 0 ) != Qt::Unchecked );
         dInfo.embeddedGroup = true;
         if ( mUpdateDrawingOrder )
         {

Original file line number	Diff line number	Diff line change
`@@ -1193,7 +1193,7 @@ QList<DrawingOrderInfo> QgsLegend::drawingOrder()`
`1193`	`1193`	`DrawingOrderInfo dInfo;`
`1194`	`1194`	`dInfo.name = lgroup->text( 0 );`
`1195`	`1195`	`dInfo.id = lgroup->projectPath();`
`1196`		`- dInfo.checked = ( lgroup->checkState( 0 ) == Qt::Checked );`
	`1196`	`+ dInfo.checked = ( lgroup->checkState( 0 ) != Qt::Unchecked );`
`1197`	`1197`	`dInfo.embeddedGroup = true;`
`1198`	`1198`	`if ( mUpdateDrawingOrder )`
`1199`	`1199`	`{`