Hide proper column in attribute table

m-kuhn · m-kuhn · commit 6f513d1cf89e · 2016-09-20T16:07:38.000+02:00
Fix #15458
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -188,7 +188,7 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa
     {
       if ( newColumnMapping.size() == mColumnMapping.size() - removedColumnCount )
       {
-        beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn + removedColumnCount );
+        beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn );
         mColumnMapping = newColumnMapping;
         endRemoveColumns();
       }
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -481,8 +481,7 @@ void QgsDualView::tableColumnResized( int column, int width )
   if ( sourceCol >= 0 )
   {
     config.setColumnWidth( sourceCol, width );
-    mLayerCache->layer()->setAttributeTableConfig( config );
-    mConfig = config;
+    setAttributeTableConfig( config );
   }
 }
 
@@ -495,7 +494,6 @@ void QgsDualView::hideColumn()
   if ( sourceCol >= 0 )
   {
     config.setColumnHidden( sourceCol, true );
-    mLayerCache->layer()->setAttributeTableConfig( config );
     setAttributeTableConfig( config );
   }
 }
@@ -518,7 +516,6 @@ void QgsDualView::resizeColumn()
     if ( ok )
     {
       config.setColumnWidth( sourceCol, width );
-      mLayerCache->layer()->setAttributeTableConfig( config );
       setAttributeTableConfig( config );
     }
   }
@@ -635,7 +632,7 @@ void QgsDualView::onSortColumnChanged()
   QgsAttributeTableConfig cfg = mLayerCache->layer()->attributeTableConfig();
   cfg.setSortExpression( mFilterModel->sortExpression() );
   cfg.setSortOrder( mFilterModel->sortOrder() );
-  mLayerCache->layer()->setAttributeTableConfig( cfg );
+  setAttributeTableConfig( cfg );
 }
 
 void QgsDualView::sortByPreviewExpression()
@@ -691,7 +688,7 @@ void QgsDualView::setSortExpression( const QString& sortExpression, Qt::SortOrde
 
   mConfig.setSortExpression( sortExpression );
   mConfig.setSortOrder( sortOrder );
-  mLayerCache->layer()->setAttributeTableConfig( mConfig );
+  setAttributeTableConfig( mConfig );
 }
 
 QString QgsDualView::sortExpression() const

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa`
`188`	`188`	`{`
`189`	`189`	`if ( newColumnMapping.size() == mColumnMapping.size() - removedColumnCount )`
`190`	`190`	`{`
`191`		`- beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn + removedColumnCount );`
	`191`	`+ beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn );`
`192`	`192`	`mColumnMapping = newColumnMapping;`
`193`	`193`	`endRemoveColumns();`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -481,8 +481,7 @@ void QgsDualView::tableColumnResized( int column, int width )`
`481`	`481`	`if ( sourceCol >= 0 )`
`482`	`482`	`{`
`483`	`483`	`config.setColumnWidth( sourceCol, width );`
`484`		`- mLayerCache->layer()->setAttributeTableConfig( config );`
`485`		`- mConfig = config;`
	`484`	`+ setAttributeTableConfig( config );`
`486`	`485`	`}`
`487`	`486`	`}`
`488`	`487`
`@@ -495,7 +494,6 @@ void QgsDualView::hideColumn()`
`495`	`494`	`if ( sourceCol >= 0 )`
`496`	`495`	`{`
`497`	`496`	`config.setColumnHidden( sourceCol, true );`
`498`		`- mLayerCache->layer()->setAttributeTableConfig( config );`
`499`	`497`	`setAttributeTableConfig( config );`
`500`	`498`	`}`
`501`	`499`	`}`
`@@ -518,7 +516,6 @@ void QgsDualView::resizeColumn()`
`518`	`516`	`if ( ok )`
`519`	`517`	`{`
`520`	`518`	`config.setColumnWidth( sourceCol, width );`
`521`		`- mLayerCache->layer()->setAttributeTableConfig( config );`
`522`	`519`	`setAttributeTableConfig( config );`
`523`	`520`	`}`
`524`	`521`	`}`
`@@ -635,7 +632,7 @@ void QgsDualView::onSortColumnChanged()`
`635`	`632`	`QgsAttributeTableConfig cfg = mLayerCache->layer()->attributeTableConfig();`
`636`	`633`	`cfg.setSortExpression( mFilterModel->sortExpression() );`
`637`	`634`	`cfg.setSortOrder( mFilterModel->sortOrder() );`
`638`		`- mLayerCache->layer()->setAttributeTableConfig( cfg );`
	`635`	`+ setAttributeTableConfig( cfg );`
`639`	`636`	`}`
`640`	`637`
`641`	`638`	`void QgsDualView::sortByPreviewExpression()`
`@@ -691,7 +688,7 @@ void QgsDualView::setSortExpression( const QString& sortExpression, Qt::SortOrde`
`691`	`688`
`692`	`689`	`mConfig.setSortExpression( sortExpression );`
`693`	`690`	`mConfig.setSortOrder( sortOrder );`
`694`		`- mLayerCache->layer()->setAttributeTableConfig( mConfig );`
	`691`	`+ setAttributeTableConfig( mConfig );`
`695`	`692`	`}`
`696`	`693`
`697`	`694`	`QString QgsDualView::sortExpression() const`