Fix #7459: Sorting of attribute table takes type into account

m-kuhn · m-kuhn · commit f28f13cd2462 · 2013-03-27T16:41:16.000+01:00
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -36,6 +36,7 @@ QgsAttributeTableFilterModel::QgsAttributeTableFilterModel( QgsMapCanvas* canvas
   mMasterSelection = new QItemSelectionModel( this, this );
   setSourceModel( sourceModel );
   setDynamicSortFilter( true );
+  setSortRole( QgsAttributeTableModel::SortRole );
   connect( layer(), SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) );
 }
 
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -422,7 +422,7 @@ QVariant QgsAttributeTableModel::headerData( int section, Qt::Orientation orient
 
 QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) const
 {
-  if ( !index.isValid() || ( role != Qt::TextAlignmentRole && role != Qt::DisplayRole && role != Qt::EditRole ) )
+  if ( !index.isValid() || ( role != Qt::TextAlignmentRole && role != Qt::DisplayRole && role != Qt::EditRole && role != SortRole ) )
     return QVariant();
 
   QgsFeatureId rowId = rowToId( index.row() );
@@ -483,6 +483,11 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
     }
   }
 
+  if ( role == SortRole )
+  {
+    return val;
+  }
+
   return field.displayString( val );
 }
 
diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h
@@ -42,6 +42,12 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
 {
     Q_OBJECT
 
+  public:
+    enum Role
+    {
+      SortRole = Qt::UserRole + 1
+    };
+
   public:
     /**
      * Constructor

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ QgsAttributeTableFilterModel::QgsAttributeTableFilterModel( QgsMapCanvas* canvas`
`36`	`36`	`mMasterSelection = new QItemSelectionModel( this, this );`
`37`	`37`	`setSourceModel( sourceModel );`
`38`	`38`	`setDynamicSortFilter( true );`
	`39`	`+ setSortRole( QgsAttributeTableModel::SortRole );`
`39`	`40`	`connect( layer(), SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) );`
`40`	`41`	`}`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ QVariant QgsAttributeTableModel::headerData( int section, Qt::Orientation orient`
`422`	`422`
`423`	`423`	`QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) const`
`424`	`424`	`{`
`425`		`- if ( !index.isValid() \|\| ( role != Qt::TextAlignmentRole && role != Qt::DisplayRole && role != Qt::EditRole ) )`
	`425`	`+ if ( !index.isValid() \|\| ( role != Qt::TextAlignmentRole && role != Qt::DisplayRole && role != Qt::EditRole && role != SortRole ) )`
`426`	`426`	`return QVariant();`
`427`	`427`
`428`	`428`	`QgsFeatureId rowId = rowToId( index.row() );`
`@@ -483,6 +483,11 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons`
`483`	`483`	`}`
`484`	`484`	`}`
`485`	`485`
	`486`	`+ if ( role == SortRole )`
	`487`	`+ {`
	`488`	`+ return val;`
	`489`	`+ }`
	`490`	`+`
`486`	`491`	`return field.displayString( val );`
`487`	`492`	`}`
`488`	`493`