Fix #11369 (New layers are not active with new legend)

wonder-sk · wonder-sk · commit ea910d887d09 · 2014-10-22T19:57:05.000+07:00
diff --git a/python/gui/layertree/qgslayertreeview.sip b/python/gui/layertree/qgslayertreeview.sip
@@ -63,6 +63,13 @@ class QgsLayerTreeView : QTreeView
     //! Get list of selected layers
     QList<QgsMapLayer*> selectedLayers() const;
 
+    //! if enabled, current selection will be automatically changed to the newly added layer node.
+    //! This is purely for user's convenience so they do not need to click on the layer explicitly.
+    //! @note added in 2.6
+    void setAutoSelectAddedLayers( bool enabled );
+    //! @note added in 2.6
+    bool autoSelectAddedLayers() const;
+
   public slots:
     //! Force refresh of layer symbology. Normally not needed as the changes of layer's renderer are monitored by the model
     void refreshLayerSymbology( const QString& layerId );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2315,6 +2315,7 @@ void QgisApp::initLayerTreeView()
 
   mLayerTreeView->setModel( model );
   mLayerTreeView->setMenuProvider( new QgsAppLayerTreeViewMenuProvider( mLayerTreeView, mMapCanvas ) );
+  mLayerTreeView->setAutoSelectAddedLayers( true );
 
   setupLayerTreeViewFromSettings();
 
@@ -3797,6 +3798,11 @@ bool QgisApp::addProject( QString projectFile )
   // close the previous opened project if any
   closeProject();
 
+  // temporarily disable auto-select for project loading
+  // (having it on all the time would give inconsistent results,
+  // e.g. we select the first node if it is a layer, but not if it is a group)
+  mLayerTreeView->setAutoSelectAddedLayers( false );
+
   if ( ! QgsProject::instance()->read( projectFile ) )
   {
     QApplication::restoreOverrideCursor();
@@ -3812,6 +3818,8 @@ bool QgisApp::addProject( QString projectFile )
     return false;
   }
 
+  mLayerTreeView->setAutoSelectAddedLayers( true );
+
   setTitleBarText_( *this );
   int  myRedInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorRedPart", 255 );
   int  myGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorGreenPart", 255 );
diff --git a/src/core/layertree/qgslayertreeregistrybridge.cpp b/src/core/layertree/qgslayertreeregistrybridge.cpp
@@ -49,14 +49,13 @@ void QgsLayerTreeRegistryBridge::layersAdded( QList<QgsMapLayer*> layers )
   if ( !mEnabled )
     return;
 
-  int i = 0;
+  QList<QgsLayerTreeNode*> nodes;
   foreach ( QgsMapLayer* layer, layers )
   {
     QgsLayerTreeLayer* nodeLayer = new QgsLayerTreeLayer( layer );
     nodeLayer->setVisible( mNewLayersVisible ? Qt::Checked : Qt::Unchecked );
 
-    // add new layer to the top
-    mInsertionPointGroup->insertChildNode( mInsertionPointIndex + i++, nodeLayer );
+    nodes << nodeLayer;
 
     // check whether the layer is marked as embedded
     QString projectFile = QgsProject::instance()->layerIsEmbedded( nodeLayer->layerId() );
@@ -66,6 +65,9 @@ void QgsLayerTreeRegistryBridge::layersAdded( QList<QgsMapLayer*> layers )
       nodeLayer->setCustomProperty( "embedded_project", projectFile );
     }
   }
+
+  // add new layers to the right place
+  mInsertionPointGroup->insertChildNodes( mInsertionPointIndex, nodes );
 }
 
 void QgsLayerTreeRegistryBridge::layersWillBeRemoved( QStringList layerIds )
diff --git a/src/gui/layertree/qgslayertreeview.cpp b/src/gui/layertree/qgslayertreeview.cpp
@@ -28,6 +28,7 @@ QgsLayerTreeView::QgsLayerTreeView( QWidget *parent )
     : QTreeView( parent )
     , mDefaultActions( 0 )
     , mMenuProvider( 0 )
+    , mAutoSelectAddedLayers( false )
 {
   setHeaderHidden( true );
 
@@ -131,11 +132,16 @@ void QgsLayerTreeView::modelRowsInserted( QModelIndex index, int start, int end
   if ( QgsLayerTree::isLayer( parentNode ) )
     return; // layers have only symbology nodes (no expanded/collapsed handling)
 
+  QList<QgsLayerTreeNode*> children = parentNode->children();
   for ( int i = start; i <= end; ++i )
   {
-    updateExpandedStateFromNode( parentNode->children()[i] );
+    updateExpandedStateFromNode( children[i] );
   }
 
+  // make newly added layer active (if auto-select is enabled)
+  if ( mAutoSelectAddedLayers && QgsLayerTree::isLayer( children[start] ) )
+    setCurrentIndex( layerTreeModel()->node2index( children[start] ) );
+
   // make sure we still have correct current layer
   onCurrentChanged();
 }
diff --git a/src/gui/layertree/qgslayertreeview.h b/src/gui/layertree/qgslayertreeview.h
@@ -81,6 +81,13 @@ class GUI_EXPORT QgsLayerTreeView : public QTreeView
     //! Get list of selected layers
     QList<QgsMapLayer*> selectedLayers() const;
 
+    //! if enabled, current selection will be automatically changed to the newly added layer node.
+    //! This is purely for user's convenience so they do not need to click on the layer explicitly.
+    //! @note added in 2.6
+    void setAutoSelectAddedLayers( bool enabled ) { mAutoSelectAddedLayers = enabled; }
+    //! @note added in 2.6
+    bool autoSelectAddedLayers() const { return mAutoSelectAddedLayers; }
+
   public slots:
     //! Force refresh of layer symbology. Normally not needed as the changes of layer's renderer are monitored by the model
     void refreshLayerSymbology( const QString& layerId );
@@ -114,6 +121,8 @@ class GUI_EXPORT QgsLayerTreeView : public QTreeView
     QgsLayerTreeViewMenuProvider* mMenuProvider;
     //! Keeps track of current layer ID (to check when to emit signal about change of current layer)
     QString mCurrentLayerID;
+    //! Indicates whether the view should select newly added layers when they are added to the model
+    bool mAutoSelectAddedLayers;
 };
 
 

Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,13 @@ void QgsLayerTreeRegistryBridge::layersAdded( QList<QgsMapLayer*> layers )`
`49`	`49`	`if ( !mEnabled )`
`50`	`50`	`return;`
`51`	`51`
`52`		`- int i = 0;`
	`52`	`+ QList<QgsLayerTreeNode*> nodes;`
`53`	`53`	`foreach ( QgsMapLayer* layer, layers )`
`54`	`54`	`{`
`55`	`55`	`QgsLayerTreeLayer* nodeLayer = new QgsLayerTreeLayer( layer );`
`56`	`56`	`nodeLayer->setVisible( mNewLayersVisible ? Qt::Checked : Qt::Unchecked );`
`57`	`57`
`58`		`- // add new layer to the top`
`59`		`- mInsertionPointGroup->insertChildNode( mInsertionPointIndex + i++, nodeLayer );`
	`58`	`+ nodes << nodeLayer;`
`60`	`59`
`61`	`60`	`// check whether the layer is marked as embedded`
`62`	`61`	`QString projectFile = QgsProject::instance()->layerIsEmbedded( nodeLayer->layerId() );`
`@@ -66,6 +65,9 @@ void QgsLayerTreeRegistryBridge::layersAdded( QList<QgsMapLayer*> layers )`
`66`	`65`	`nodeLayer->setCustomProperty( "embedded_project", projectFile );`
`67`	`66`	`}`
`68`	`67`	`}`
	`68`	`+`
	`69`	`+ // add new layers to the right place`
	`70`	`+ mInsertionPointGroup->insertChildNodes( mInsertionPointIndex, nodes );`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`void QgsLayerTreeRegistryBridge::layersWillBeRemoved( QStringList layerIds )`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ QgsLayerTreeView::QgsLayerTreeView( QWidget *parent )`
`28`	`28`	`: QTreeView( parent )`
`29`	`29`	`, mDefaultActions( 0 )`
`30`	`30`	`, mMenuProvider( 0 )`
	`31`	`+ , mAutoSelectAddedLayers( false )`
`31`	`32`	`{`
`32`	`33`	`setHeaderHidden( true );`
`33`	`34`
`@@ -131,11 +132,16 @@ void QgsLayerTreeView::modelRowsInserted( QModelIndex index, int start, int end`
`131`	`132`	`if ( QgsLayerTree::isLayer( parentNode ) )`
`132`	`133`	`return; // layers have only symbology nodes (no expanded/collapsed handling)`
`133`	`134`
	`135`	`+ QList<QgsLayerTreeNode*> children = parentNode->children();`
`134`	`136`	`for ( int i = start; i <= end; ++i )`
`135`	`137`	`{`
`136`		`- updateExpandedStateFromNode( parentNode->children()[i] );`
	`138`	`+ updateExpandedStateFromNode( children[i] );`
`137`	`139`	`}`
`138`	`140`
	`141`	`+ // make newly added layer active (if auto-select is enabled)`
	`142`	`+ if ( mAutoSelectAddedLayers && QgsLayerTree::isLayer( children[start] ) )`
	`143`	`+ setCurrentIndex( layerTreeModel()->node2index( children[start] ) );`
	`144`	`+`
`139`	`145`	`// make sure we still have correct current layer`
`140`	`146`	`onCurrentChanged();`
`141`	`147`	`}`