Fix editing composer legend titles while filtering enabled (fix #11459)

qgis · Jan 27, 2016 · c7204cc · c7204cc
1 parent 6893f49
commit c7204cc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/python/core/layertree/qgslayertreemodel.sip b/python/core/layertree/qgslayertreemodel.sip
@@ -93,10 +93,16 @@ class QgsLayerTreeModel : QAbstractItemModel
     //! @note added in 2.6
     QModelIndex legendNode2index( QgsLayerTreeModelLegendNode* legendNode );
 
-    //! Return list of legend nodes attached to a particular layer node
+    //! Return filtered list of active legend nodes attached to a particular layer node
     //! @note added in 2.6
+    //! @see layerOriginalLegendNodes()
     QList<QgsLayerTreeModelLegendNode*> layerLegendNodes( QgsLayerTreeLayer* nodeLayer );
 
+    //! Return original (unfiltered) list of legend nodes attached to a particular layer node
+    //! @note added in 2.14
+    //! @see layerLegendNodes()
+    QList<QgsLayerTreeModelLegendNode*> layerOriginalLegendNodes( QgsLayerTreeLayer* nodeLayer );
+
     /** Searches through the layer tree to find a legend node with a matching layer ID
      * and rule key.
      * @param layerId map layer ID

diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -773,7 +773,10 @@ void QgsComposerLegendWidget::on_mEditPushButton_clicked()
   else if ( legendNode )
   {
     QList<int> order = QgsMapLayerLegendUtils::legendNodeOrder( legendNode->layerNode() );
-    int originalIndex = ( idx.row() >= 0 && idx.row() < order.count() ? order[idx.row()] : -1 );
+    //find unfiltered row number
+    QList<QgsLayerTreeModelLegendNode*> layerLegendNodes = model->layerOriginalLegendNodes( legendNode->layerNode() );
+    int unfilteredRowIndex = layerLegendNodes.indexOf( legendNode );
+    int originalIndex = ( unfilteredRowIndex >= 0 && unfilteredRowIndex < order.count() ? order[unfilteredRowIndex] : -1 );
     QgsMapLayerLegendUtils::setLegendNodeUserLabel( legendNode->layerNode(), originalIndex, newText );
     model->refreshLayerLegend( legendNode->layerNode() );
   }

diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -1338,6 +1338,11 @@ QList<QgsLayerTreeModelLegendNode*> QgsLayerTreeModel::layerLegendNodes( QgsLaye
   return mLegend.value( nodeLayer ).activeNodes;
 }
 
+QList<QgsLayerTreeModelLegendNode*> QgsLayerTreeModel::layerOriginalLegendNodes( QgsLayerTreeLayer* nodeLayer )
+{
+  return mLegend.value( nodeLayer ).originalNodes;
+}
+
 QgsLayerTreeModelLegendNode* QgsLayerTreeModel::findLegendNode( const QString& layerId, const QString& ruleKey ) const
 {
   Q_FOREACH ( QgsLayerTreeLayer* layer, mLegend.keys() )

diff --git a/src/core/layertree/qgslayertreemodel.h b/src/core/layertree/qgslayertreemodel.h
@@ -117,10 +117,16 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel
     //! @note added in 2.6
     QModelIndex legendNode2index( QgsLayerTreeModelLegendNode* legendNode );
 
-    //! Return list of legend nodes attached to a particular layer node
+    //! Return filtered list of active legend nodes attached to a particular layer node
     //! @note added in 2.6
+    //! @see layerOriginalLegendNodes()
     QList<QgsLayerTreeModelLegendNode*> layerLegendNodes( QgsLayerTreeLayer* nodeLayer );
 
+    //! Return original (unfiltered) list of legend nodes attached to a particular layer node
+    //! @note added in 2.14
+    //! @see layerLegendNodes()
+    QList<QgsLayerTreeModelLegendNode*> layerOriginalLegendNodes( QgsLayerTreeLayer* nodeLayer );
+
     /** Searches through the layer tree to find a legend node with a matching layer ID
      * and rule key.
      * @param layerId map layer ID