sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix re-initialization of dual view

Browse Source
This commit is contained in:
Matthias Kuhn 2014-09-22 22:42:09 +02:00
parent f351195d94
commit 55f86d5dfa
5 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/attributetable/qgsattributetableview.cpp
View File

@ -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

3
src/gui/attributetable/qgsattributetableview.h
View File

@ -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;

28
src/gui/attributetable/qgsdualview.cpp
View File

@ -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 );
}

1
src/gui/attributetable/qgsdualview.h
View File

@ -232,6 +232,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
QProgressDialog* mProgressDlg;
QgsIFeatureSelectionManager* mFeatureSelectionManager;
QgsDistanceArea mDistanceArea;
QString mDisplayExpression;
friend class TestQgsDualView;
};

2
src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
View File

@ -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 );
}