Create and initialize QTreeWidgetItems in separate function

qgis · Nov 22, 2021 · 555d5d9 · 555d5d9
1 parent 976f076
commit 555d5d9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -654,21 +654,17 @@ void QgsRelationEditorWidget::updateUiMultiEdit()
   QMultiMap<QTreeWidgetItem *, QgsFeatureId> multimapChildFeatures;
 
   mMultiEditTreeWidget->clear();
-  for ( const QgsFeature &feature : std::as_const( mFeatureList ) )
+  for ( const QgsFeature &featureParent : std::as_const( mFeatureList ) )
   {
-    QTreeWidgetItem *treeWidgetItem = new QTreeWidgetItem( mMultiEditTreeWidget );
-    initializeMultiEditTreeWidgetItem( treeWidgetItem,
-                                       QgsVectorLayerUtils::getFeatureDisplayString( mRelation.referencedLayer(), feature ),
-                                       QgsIconUtils::iconForLayer( mRelation.referencedLayer() ),
-                                       MultiEditFeatureType::Parent );
+    QTreeWidgetItem *treeWidgetItem = createMultiEditTreeWidgetItem( featureParent, mRelation.referencedLayer(), MultiEditFeatureType::Parent );
 
     // Parent feature items are not selectable
     treeWidgetItem->setFlags( Qt::ItemIsEnabled );
 
     parentTreeWidgetItems.append( treeWidgetItem );
 
     // Get child features
-    const QgsFeatureRequest request = relation().getRelatedFeaturesRequest( feature );
+    const QgsFeatureRequest request = relation().getRelatedFeaturesRequest( featureParent );
     QgsFeatureIterator featureIterator = mRelation.referencingLayer()->getFeatures( request );
     QgsFeature featureChild;
     while ( featureIterator.nextFeature( featureChild ) )
@@ -680,12 +676,7 @@ void QgsRelationEditorWidget::updateUiMultiEdit()
         QgsFeature featureChildChild;
         while ( featureIteratorFinalChild.nextFeature( featureChildChild ) )
         {
-          QTreeWidgetItem *treeWidgetItemChild = new QTreeWidgetItem( treeWidgetItem );
-          initializeMultiEditTreeWidgetItem( treeWidgetItemChild,
-                                             QgsVectorLayerUtils::getFeatureDisplayString( mNmRelation.referencedLayer(), featureChildChild ),
-                                             QgsIconUtils::iconForLayer( mNmRelation.referencedLayer() ),
-                                             MultiEditFeatureType::Child,
-                                             featureChildChild.id() );
+          QTreeWidgetItem *treeWidgetItemChild = createMultiEditTreeWidgetItem( featureChildChild, mNmRelation.referencedLayer(), MultiEditFeatureType::Child );
 
           treeWidgetItem->addChild( treeWidgetItemChild );
 
@@ -695,20 +686,15 @@ void QgsRelationEditorWidget::updateUiMultiEdit()
       }
       else
       {
-        QTreeWidgetItem *treeWidgetItemChild = new QTreeWidgetItem( treeWidgetItem );
-        initializeMultiEditTreeWidgetItem( treeWidgetItemChild,
-                                           QgsVectorLayerUtils::getFeatureDisplayString( mRelation.referencingLayer(), featureChild ),
-                                           QgsIconUtils::iconForLayer( mRelation.referencingLayer() ),
-                                           MultiEditFeatureType::Child,
-                                           featureChild.id() );
+        QTreeWidgetItem *treeWidgetItemChild = createMultiEditTreeWidgetItem( featureChild, mRelation.referencingLayer(), MultiEditFeatureType::Child );
         treeWidgetItem->addChild( treeWidgetItemChild );
 
         featureIdsMixedValues.insert( featureChild.id() );
       }
     }
 
-    treeWidgetItem->setExpanded( true );
     mMultiEditTreeWidget->addTopLevelItem( treeWidgetItem );
+    treeWidgetItem->setExpanded( true );
   }
 
   // Set mixed values indicator (Green or Orange)
@@ -778,16 +764,14 @@ void QgsRelationEditorWidget::updateUiMultiEdit()
   }
 }
 
-void QgsRelationEditorWidget::initializeMultiEditTreeWidgetItem( QTreeWidgetItem *treeWidgetItem,
-    const QString &text,
-    const QIcon &icon,
-    MultiEditFeatureType type,
-    const QVariant &featureId )
+QTreeWidgetItem *QgsRelationEditorWidget::createMultiEditTreeWidgetItem( const QgsFeature &feature, QgsVectorLayer *layer, MultiEditFeatureType type )
 {
-  treeWidgetItem->setText( 0, text );
-  treeWidgetItem->setIcon( 0, icon );
+  QTreeWidgetItem *treeWidgetItem = new QTreeWidgetItem();
+  treeWidgetItem->setText( 0, QgsVectorLayerUtils::getFeatureDisplayString( layer, feature ) );
+  treeWidgetItem->setIcon( 0, QgsIconUtils::iconForLayer( layer ) );
   treeWidgetItem->setData( 0, static_cast<int>( MultiEditTreeWidgetRole::FeatureType ), static_cast<int>( type ) );
-  treeWidgetItem->setData( 0, static_cast<int>( MultiEditTreeWidgetRole::FeatureId ), featureId );
+  treeWidgetItem->setData( 0, static_cast<int>( MultiEditTreeWidgetRole::FeatureId ), feature.id() );
+  return treeWidgetItem;
 }
 
 void QgsRelationEditorWidget::onKeyPressed( QKeyEvent *e )

diff --git a/src/gui/qgsrelationeditorwidget.h b/src/gui/qgsrelationeditorwidget.h
@@ -232,11 +232,7 @@ class GUI_EXPORT QgsRelationEditorWidget : public QgsAbstractRelationEditorWidge
     QgsFeatureIds selectedChildFeatureIds() const;
     void updateUiSingleEdit();
     void updateUiMultiEdit();
-    void initializeMultiEditTreeWidgetItem( QTreeWidgetItem *treeWidgetItem,
-                                            const QString &text,
-                                            const QIcon &icon,
-                                            MultiEditFeatureType type,
-                                            const QVariant &featureId = QVariant() );
+    QTreeWidgetItem *createMultiEditTreeWidgetItem( const QgsFeature &feature, QgsVectorLayer *layer, MultiEditFeatureType type );
 
     QgsDualView *mDualView = nullptr;
     QPointer<QgsMessageBarItem> mMessageBarItem;