Hide proper column in attribute table

m-kuhn · m-kuhn · commit 1856a37a4a37 · 2016-09-20T16:06:30.000+02:00
Fix #15458
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -187,7 +187,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
@@ -524,8 +524,7 @@ void QgsDualView::tableColumnResized( int column, int width )
   if ( sourceCol >= 0 )
   {
     config.setColumnWidth( sourceCol, width );
-    mLayerCache->layer()->setAttributeTableConfig( config );
-    mConfig = config;
+    setAttributeTableConfig( config );
   }
 }
 
@@ -538,7 +537,6 @@ void QgsDualView::hideColumn()
   if ( sourceCol >= 0 )
   {
     config.setColumnHidden( sourceCol, true );
-    mLayerCache->layer()->setAttributeTableConfig( config );
     setAttributeTableConfig( config );
   }
 }
@@ -561,7 +559,6 @@ void QgsDualView::resizeColumn()
     if ( ok )
     {
       config.setColumnWidth( sourceCol, width );
-      mLayerCache->layer()->setAttributeTableConfig( config );
       setAttributeTableConfig( config );
     }
   }
@@ -661,7 +658,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()
@@ -717,7 +714,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
`@@ -187,7 +187,7 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa`
`187`	`187`	`{`
`188`	`188`	`if ( newColumnMapping.size() == mColumnMapping.size() - removedColumnCount )`
`189`	`189`	`{`
`190`		`- beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn + removedColumnCount );`
	`190`	`+ beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn );`
`191`	`191`	`mColumnMapping = newColumnMapping;`
`192`	`192`	`endRemoveColumns();`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -524,8 +524,7 @@ void QgsDualView::tableColumnResized( int column, int width )`
`524`	`524`	`if ( sourceCol >= 0 )`
`525`	`525`	`{`
`526`	`526`	`config.setColumnWidth( sourceCol, width );`
`527`		`- mLayerCache->layer()->setAttributeTableConfig( config );`
`528`		`- mConfig = config;`
	`527`	`+ setAttributeTableConfig( config );`
`529`	`528`	`}`
`530`	`529`	`}`
`531`	`530`
`@@ -538,7 +537,6 @@ void QgsDualView::hideColumn()`
`538`	`537`	`if ( sourceCol >= 0 )`
`539`	`538`	`{`
`540`	`539`	`config.setColumnHidden( sourceCol, true );`
`541`		`- mLayerCache->layer()->setAttributeTableConfig( config );`
`542`	`540`	`setAttributeTableConfig( config );`
`543`	`541`	`}`
`544`	`542`	`}`
`@@ -561,7 +559,6 @@ void QgsDualView::resizeColumn()`
`561`	`559`	`if ( ok )`
`562`	`560`	`{`
`563`	`561`	`config.setColumnWidth( sourceCol, width );`
`564`		`- mLayerCache->layer()->setAttributeTableConfig( config );`
`565`	`562`	`setAttributeTableConfig( config );`
`566`	`563`	`}`
`567`	`564`	`}`
`@@ -661,7 +658,7 @@ void QgsDualView::onSortColumnChanged()`
`661`	`658`	`QgsAttributeTableConfig cfg = mLayerCache->layer()->attributeTableConfig();`
`662`	`659`	`cfg.setSortExpression( mFilterModel->sortExpression() );`
`663`	`660`	`cfg.setSortOrder( mFilterModel->sortOrder() );`
`664`		`- mLayerCache->layer()->setAttributeTableConfig( cfg );`
	`661`	`+ setAttributeTableConfig( cfg );`
`665`	`662`	`}`
`666`	`663`
`667`	`664`	`void QgsDualView::sortByPreviewExpression()`
`@@ -717,7 +714,7 @@ void QgsDualView::setSortExpression( const QString& sortExpression, Qt::SortOrde`
`717`	`714`
`718`	`715`	`mConfig.setSortExpression( sortExpression );`
`719`	`716`	`mConfig.setSortOrder( sortOrder );`
`720`		`- mLayerCache->layer()->setAttributeTableConfig( mConfig );`
	`717`	`+ setAttributeTableConfig( mConfig );`
`721`	`718`	`}`
`722`	`719`
`723`	`720`	`QString QgsDualView::sortExpression() const`