Fix re-initialization of dual view

m-kuhn · m-kuhn · commit 55f86d5dfad2 · 2014-09-22T22:42:09.000+02:00
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -118,8 +118,10 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel* filterModel
   mFilterModel = filterModel;
   QTableView::setModel( filterModel );
 
+  connect( mFilterModel, SIGNAL( destroyed() ), this, SLOT( modelDeleted() ) );
+
   delete mFeatureSelectionModel;
-  mFeatureSelectionModel = NULL;
+  mFeatureSelectionModel = 0;
 
   if ( filterModel )
   {
@@ -255,6 +257,13 @@ void QgsAttributeTableView::_q_selectRow( int row )
   selectRow( row, false );
 }
 
+void QgsAttributeTableView::modelDeleted()
+{
+  mFilterModel = 0;
+  mFeatureSelectionManager = 0;
+  mFeatureSelectionModel = 0;
+}
+
 void QgsAttributeTableView::selectRow( int row, bool anchor )
 {
   if ( selectionBehavior() == QTableView::SelectColumns
diff --git a/src/gui/attributetable/qgsattributetableview.h b/src/gui/attributetable/qgsattributetableview.h
@@ -137,6 +137,9 @@ class GUI_EXPORT QgsAttributeTableView : public QTableView
     virtual void selectRow( int row );
     virtual void _q_selectRow( int row );
 
+  private slots:
+    void modelDeleted();
+
   private:
     void selectRow( int row, bool anchor );
     QgsAttributeTableModel* mMasterModel;
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -37,6 +37,8 @@ QgsDualView::QgsDualView( QWidget* parent )
     : QStackedWidget( parent )
     , mEditorContext()
     , mMasterModel( 0 )
+    , mFilterModel( 0 )
+    , mFeatureListModel( 0 )
     , mAttributeForm( 0 )
     , mLayerCache( 0 )
     , mProgressDlg( 0 )
@@ -78,7 +80,9 @@ void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, const Qg
 
   connect( mAttributeForm, SIGNAL( attributeChanged( QString, QVariant ) ), this, SLOT( featureFormAttributeChanged() ) );
 
-  if ( !mFeatureListPreviewButton->actions().count() )
+  if ( mFeatureListPreviewButton->defaultAction() )
+    mFeatureList->setDisplayExpression( mDisplayExpression );
+  else
     columnBoxInit();
 }
 
@@ -143,21 +147,10 @@ void QgsDualView::columnBoxInit()
     }
   }
 
-  // now initialise the menu
-  QList< QAction* > previewActions = mFeatureListPreviewButton->actions();
-  foreach ( QAction* a, previewActions )
-  {
-    if ( a != mActionExpressionPreview )
-    {
-      mPreviewActionMapper->removeMappings( a );
-      delete a;
-    }
-  }
-
   mFeatureListPreviewButton->addAction( mActionExpressionPreview );
   mFeatureListPreviewButton->addAction( mActionPreviewColumnsMenu );
 
-  foreach ( const QgsField& field, fields )
+  Q_FOREACH( const QgsField& field, fields )
   {
     if ( mLayerCache->layer()->editorWidgetV2( mLayerCache->layer()->fieldNameIndex( field.name() ) ) != "Hidden" )
     {
@@ -182,6 +175,7 @@ void QgsDualView::columnBoxInit()
   {
     mFeatureList->setDisplayExpression( displayExpression );
     mFeatureListPreviewButton->setDefaultAction( mActionExpressionPreview );
+    mDisplayExpression = mFeatureList->displayExpression();
   }
   else
   {
@@ -223,6 +217,10 @@ void QgsDualView::initLayerCache( QgsVectorLayer* layer )
 
 void QgsDualView::initModels( QgsMapCanvas* mapCanvas, const QgsFeatureRequest& request )
 {
+  delete mFeatureListModel;
+  delete mFilterModel;
+  delete mMasterModel;
+
   mMasterModel = new QgsAttributeTableModel( mLayerCache, this );
   mMasterModel->setRequest( request );
   mMasterModel->setEditorContext( mEditorContext );
@@ -282,6 +280,8 @@ void QgsDualView::previewExpressionBuilder()
     mFeatureListPreviewButton->setDefaultAction( mActionExpressionPreview );
     mFeatureListPreviewButton->setPopupMode( QToolButton::MenuButtonPopup );
   }
+
+  mDisplayExpression = mFeatureList->displayExpression();
 }
 
 void QgsDualView::previewColumnChanged( QObject* action )
@@ -306,6 +306,8 @@ void QgsDualView::previewColumnChanged( QObject* action )
     }
   }
 
+  mDisplayExpression = mFeatureList->displayExpression();
+
   Q_ASSERT( previewAction );
 }
 
diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
@@ -232,6 +232,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
     QProgressDialog* mProgressDlg;
     QgsIFeatureSelectionManager* mFeatureSelectionManager;
     QgsDistanceArea mDistanceArea;
+    QString mDisplayExpression;
 
     friend class TestQgsDualView;
 };
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -34,7 +34,7 @@ QWidget* QgsRelationWidgetWrapper::createWidget( QWidget* parent )
 
 void QgsRelationWidgetWrapper::setFeature( const QgsFeature& feature )
 {
-  if ( mWidget )
+  if ( mWidget && mRelation.isValid() )
     mWidget->setRelationFeature( mRelation, feature );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ QgsDualView::QgsDualView( QWidget* parent )`
`37`	`37`	`: QStackedWidget( parent )`
`38`	`38`	`, mEditorContext()`
`39`	`39`	`, mMasterModel( 0 )`
	`40`	`+ , mFilterModel( 0 )`
	`41`	`+ , mFeatureListModel( 0 )`
`40`	`42`	`, mAttributeForm( 0 )`
`41`	`43`	`, mLayerCache( 0 )`
`42`	`44`	`, mProgressDlg( 0 )`
`@@ -78,7 +80,9 @@ void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, const Qg`
`78`	`80`
`79`	`81`	`connect( mAttributeForm, SIGNAL( attributeChanged( QString, QVariant ) ), this, SLOT( featureFormAttributeChanged() ) );`
`80`	`82`
`81`		`- if ( !mFeatureListPreviewButton->actions().count() )`
	`83`	`+ if ( mFeatureListPreviewButton->defaultAction() )`
	`84`	`+ mFeatureList->setDisplayExpression( mDisplayExpression );`
	`85`	`+ else`
`82`	`86`	`columnBoxInit();`
`83`	`87`	`}`
`84`	`88`
`@@ -143,21 +147,10 @@ void QgsDualView::columnBoxInit()`
`143`	`147`	`}`
`144`	`148`	`}`
`145`	`149`
`146`		`- // now initialise the menu`
`147`		`- QList< QAction* > previewActions = mFeatureListPreviewButton->actions();`
`148`		`- foreach ( QAction* a, previewActions )`
`149`		`- {`
`150`		`- if ( a != mActionExpressionPreview )`
`151`		`- {`
`152`		`- mPreviewActionMapper->removeMappings( a );`
`153`		`- delete a;`
`154`		`- }`
`155`		`- }`
`156`		`-`
`157`	`150`	`mFeatureListPreviewButton->addAction( mActionExpressionPreview );`
`158`	`151`	`mFeatureListPreviewButton->addAction( mActionPreviewColumnsMenu );`
`159`	`152`
`160`		`- foreach ( const QgsField& field, fields )`
	`153`	`+ Q_FOREACH( const QgsField& field, fields )`
`161`	`154`	`{`
`162`	`155`	`if ( mLayerCache->layer()->editorWidgetV2( mLayerCache->layer()->fieldNameIndex( field.name() ) ) != "Hidden" )`
`163`	`156`	`{`
`@@ -182,6 +175,7 @@ void QgsDualView::columnBoxInit()`
`182`	`175`	`{`
`183`	`176`	`mFeatureList->setDisplayExpression( displayExpression );`
`184`	`177`	`mFeatureListPreviewButton->setDefaultAction( mActionExpressionPreview );`
	`178`	`+ mDisplayExpression = mFeatureList->displayExpression();`
`185`	`179`	`}`
`186`	`180`	`else`
`187`	`181`	`{`
`@@ -223,6 +217,10 @@ void QgsDualView::initLayerCache( QgsVectorLayer* layer )`
`223`	`217`
`224`	`218`	`void QgsDualView::initModels( QgsMapCanvas* mapCanvas, const QgsFeatureRequest& request )`
`225`	`219`	`{`
	`220`	`+ delete mFeatureListModel;`
	`221`	`+ delete mFilterModel;`
	`222`	`+ delete mMasterModel;`
	`223`	`+`
`226`	`224`	`mMasterModel = new QgsAttributeTableModel( mLayerCache, this );`
`227`	`225`	`mMasterModel->setRequest( request );`
`228`	`226`	`mMasterModel->setEditorContext( mEditorContext );`
`@@ -282,6 +280,8 @@ void QgsDualView::previewExpressionBuilder()`
`282`	`280`	`mFeatureListPreviewButton->setDefaultAction( mActionExpressionPreview );`
`283`	`281`	`mFeatureListPreviewButton->setPopupMode( QToolButton::MenuButtonPopup );`
`284`	`282`	`}`
	`283`	`+`
	`284`	`+ mDisplayExpression = mFeatureList->displayExpression();`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`void QgsDualView::previewColumnChanged( QObject* action )`
`@@ -306,6 +306,8 @@ void QgsDualView::previewColumnChanged( QObject* action )`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`
	`309`	`+ mDisplayExpression = mFeatureList->displayExpression();`
	`310`	`+`
`309`	`311`	`Q_ASSERT( previewAction );`
`310`	`312`	`}`
`311`	`313`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ QWidget* QgsRelationWidgetWrapper::createWidget( QWidget* parent )`
`34`	`34`
`35`	`35`	`void QgsRelationWidgetWrapper::setFeature( const QgsFeature& feature )`
`36`	`36`	`{`
`37`		`- if ( mWidget )`
	`37`	`+ if ( mWidget && mRelation.isValid() )`
`38`	`38`	`mWidget->setRelationFeature( mRelation, feature );`
`39`	`39`	`}`
`40`	`40`