Avoid endless sub-RelationEditorWidget creation fix #42952 (#43246)

* Avoid endless sub-RelationEditorWidget creation fix 42952 * Added missing docstring
qgis · May 17, 2021 · 40988a8 · 40988a8
1 parent 1107653
commit 40988a8
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 14 deletions.
diff --git a/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in
@@ -217,6 +217,11 @@ Duplicates features
 
 
 
+    void showEvent( QShowEvent * );
+%Docstring
+Refresh the UI when the widget becomes visible
+%End
+
  void updateTitle() /Deprecated/;
 %Docstring
 Updates the title contents to reflect the current state of the widget

diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -181,8 +181,8 @@ void QgsRelationWidgetWrapper::initWidget( QWidget *editor )
   const QgsAttributeEditorContext *ctx = &context();
   do
   {
-    if ( ( ctx->relation().name() == mRelation.name() && ctx->formMode() == QgsAttributeEditorContext::Embed )
-         || ( mNmRelation.isValid() && ctx->relation().name() == mNmRelation.name() ) )
+    if ( ( ctx->relation().id() == mRelation.id() && ctx->formMode() == QgsAttributeEditorContext::Embed )
+         || ( mNmRelation.isValid() && ctx->relation().id() == mNmRelation.id() ) )
     {
       w->setVisible( false );
       break;

diff --git a/src/gui/qgsabstractrelationeditorwidget.cpp b/src/gui/qgsabstractrelationeditorwidget.cpp
@@ -626,6 +626,11 @@ void QgsAbstractRelationEditorWidget::duplicateFeatures( const QgsFeatureIds &fi
   }
 }
 
+void QgsAbstractRelationEditorWidget::showEvent( QShowEvent * )
+{
+  updateUi();
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/gui/qgsabstractrelationeditorwidget.h b/src/gui/qgsabstractrelationeditorwidget.h
@@ -235,6 +235,11 @@ class GUI_EXPORT QgsAbstractRelationEditorWidget : public QWidget
 
     bool mForceSuppressFormPopup = false;
 
+    /**
+     * Refresh the UI when the widget becomes visible
+     */
+    void showEvent( QShowEvent * );
+
     /**
      * Updates the title contents to reflect the current state of the widget
      * \deprecated since QGIS 3.20 label is handled directly in QgsAttributeForm.

diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -192,9 +192,14 @@ QgsRelationEditorWidget::QgsRelationEditorWidget( const QVariantMap &config, QWi
   // add buttons layout
   rootLayout->addLayout( buttonLayout );
 
-  mRelationLayout = new QGridLayout();
-  mRelationLayout->setContentsMargins( 0, 0, 0, 0 );
-  rootLayout->addLayout( mRelationLayout );
+  // add dual view
+  QGridLayout *relationLayout = new QGridLayout();
+  relationLayout->setContentsMargins( 0, 0, 0, 0 );
+  mDualView = new QgsDualView( this );
+  mDualView->setView( mViewMode );
+  connect( mDualView, &QgsDualView::showContextMenuExternally, this, &QgsRelationEditorWidget::showContextMenu );
+  relationLayout->addWidget( mDualView );
+  rootLayout->addLayout( relationLayout );
 
   connect( mViewModeButtonGroup, static_cast<void ( QButtonGroup::* )( int )>( &QButtonGroup::buttonClicked ),
            this, static_cast<void ( QgsRelationEditorWidget::* )( int )>( &QgsRelationEditorWidget::setViewMode ) );
@@ -214,14 +219,6 @@ QgsRelationEditorWidget::QgsRelationEditorWidget( const QVariantMap &config, QWi
 
 void QgsRelationEditorWidget::initDualView( QgsVectorLayer *layer, const QgsFeatureRequest &request )
 {
-  if ( !mDualView )
-  {
-    mDualView = new QgsDualView( this );
-    mDualView->setView( mViewMode );
-    connect( mDualView, &QgsDualView::showContextMenuExternally, this, &QgsRelationEditorWidget::showContextMenu );
-    mRelationLayout->addWidget( mDualView );
-  }
-
   QgsAttributeEditorContext ctx { mEditorContext };
   ctx.setParentFormFeature( mFeature );
   mDualView->init( layer, mEditorContext.mapCanvas(), request, ctx );
@@ -365,6 +362,9 @@ void QgsRelationEditorWidget::updateUi()
   if ( !mRelation.isValid() || !mFeature.isValid() )
     return;
 
+  if ( !isVisible() )
+    return;
+
   QgsFeatureRequest request = mRelation.getRelatedFeaturesRequest( mFeature );
 
   if ( mNmRelation.isValid() )

diff --git a/src/gui/qgsrelationeditorwidget.h b/src/gui/qgsrelationeditorwidget.h
@@ -225,7 +225,6 @@ class GUI_EXPORT QgsRelationEditorWidget : public QgsAbstractRelationEditorWidge
     QToolButton *mFormViewButton = nullptr;
     QToolButton *mTableViewButton = nullptr;
     QToolButton *mAddFeatureGeometryButton = nullptr;
-    QGridLayout *mRelationLayout = nullptr;
     QObjectUniquePtr<QgsMapToolDigitizeFeature> mMapToolDigitize;
     QButtonGroup *mViewModeButtonGroup = nullptr;
     QgsVectorLayerSelectionManager *mFeatureSelectionMgr = nullptr;