Attribute table: always show sequential column header numbers

m-kuhn · m-kuhn · commit 9f704d6e92b9 · 2016-06-16T09:24:16.000+02:00
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -97,8 +97,13 @@ QVariant QgsAttributeTableFilterModel::headerData( int section, Qt::Orientation
   }
   else
   {
-    int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();
-    return sourceModel()->headerData( sourceSection, orientation, role );
+    if ( role == Qt::DisplayRole )
+      return section + 1;
+    else
+    {
+      int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();
+      return sourceModel()->headerData( sourceSection, orientation, role );
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,13 @@ QVariant QgsAttributeTableFilterModel::headerData( int section, Qt::Orientation`
`97`	`97`	`}`
`98`	`98`	`else`
`99`	`99`	`{`
`100`		`- int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();`
`101`		`- return sourceModel()->headerData( sourceSection, orientation, role );`
	`100`	`+ if ( role == Qt::DisplayRole )`
	`101`	`+ return section + 1;`
	`102`	`+ else`
	`103`	`+ {`
	`104`	`+ int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();`
	`105`	`+ return sourceModel()->headerData( sourceSection, orientation, role );`
	`106`	`+ }`
`102`	`107`	`}`
`103`	`108`	`}`
`104`	`109`