[attrtable] Show row numbers when first column is action widget

m-kuhn · m-kuhn · commit 4a3a814d087c · 2016-06-03T15:40:32.000+02:00
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -95,7 +95,10 @@ QVariant QgsAttributeTableFilterModel::headerData( int section, Qt::Orientation
       return QSortFilterProxyModel::headerData( section, orientation, role );
   }
   else
-    return QSortFilterProxyModel::headerData( section, orientation, role );
+  {
+    int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();
+    return sourceModel()->headerData( sourceSection, orientation, role );
+  }
 }
 
 int QgsAttributeTableFilterModel::actionColumnIndex() const

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,10 @@ QVariant QgsAttributeTableFilterModel::headerData( int section, Qt::Orientation`
`95`	`95`	`return QSortFilterProxyModel::headerData( section, orientation, role );`
`96`	`96`	`}`
`97`	`97`	`else`
`98`		`- return QSortFilterProxyModel::headerData( section, orientation, role );`
	`98`	`+ {`
	`99`	`+ int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();` Comment on line R99 rouault commented on Jun 20, 2016 rouault on Jun 20, 2016 Contributor @m-kuhn In case you want to check my fix ( `1cd7808` ) is appropriate, this commit caused http://hub.qgis.org/issues/15047 Not sure why the failed test didn't trigger on Travis: perhaps because it relies on a non-debug build of QT ? Code has comments. Press enter to view.
	`100`	`+ return sourceModel()->headerData( sourceSection, orientation, role );`
	`101`	`+ }`
`99`	`102`	`}`
`100`	`103`
`101`	`104`	`int QgsAttributeTableFilterModel::actionColumnIndex() const`