[attrtable] Fix column synchronization

m-kuhn · m-kuhn · commit a98ffed2c615 · 2013-05-18T16:25:59.000+02:00
Columns have been missing, after removing all columns and readding them
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgsapplication.h"
 #include "qgsattributetablemodel.h"
 #include "qgsattributetablefiltermodel.h"
 
@@ -262,15 +263,15 @@ void QgsAttributeTableModel::loadAttributes()
     attributes << idx;
   }
 
-  if ( columnCount() < attributes.size() )
+  if ( mFieldCount < attributes.size() )
   {
     ins = true;
-    beginInsertColumns( QModelIndex(), columnCount(), attributes.size() - 1 );
+    beginInsertColumns( QModelIndex(), mFieldCount, attributes.size() - 1 );
   }
-  else if ( attributes.size() < columnCount() )
+  else if ( attributes.size() < mFieldCount )
   {
     rm = true;
-    beginRemoveColumns( QModelIndex(), attributes.size(), columnCount() - 1 );
+    beginRemoveColumns( QModelIndex(), attributes.size(), mFieldCount - 1 );
   }
 
   mFieldCount = attributes.size();

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`* *`
`14`	`14`	`***************************************************************************/`
`15`	`15`
	`16`	`+#include "qgsapplication.h"`
`16`	`17`	`#include "qgsattributetablemodel.h"`
`17`	`18`	`#include "qgsattributetablefiltermodel.h"`
`18`	`19`
`@@ -262,15 +263,15 @@ void QgsAttributeTableModel::loadAttributes()`
`262`	`263`	`attributes << idx;`
`263`	`264`	`}`
`264`	`265`
`265`		`- if ( columnCount() < attributes.size() )`
	`266`	`+ if ( mFieldCount < attributes.size() )`
`266`	`267`	`{`
`267`	`268`	`ins = true;`
`268`		`- beginInsertColumns( QModelIndex(), columnCount(), attributes.size() - 1 );`
	`269`	`+ beginInsertColumns( QModelIndex(), mFieldCount, attributes.size() - 1 );`
`269`	`270`	`}`
`270`		`- else if ( attributes.size() < columnCount() )`
	`271`	`+ else if ( attributes.size() < mFieldCount )`
`271`	`272`	`{`
`272`	`273`	`rm = true;`
`273`		`- beginRemoveColumns( QModelIndex(), attributes.size(), columnCount() - 1 );`
	`274`	`+ beginRemoveColumns( QModelIndex(), attributes.size(), mFieldCount - 1 );`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`mFieldCount = attributes.size();`