diff options
Diffstat (limited to 'silx/gui/data/RecordTableView.py')
| -rw-r--r-- | silx/gui/data/RecordTableView.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/silx/gui/data/RecordTableView.py b/silx/gui/data/RecordTableView.py index ce6a178..54881b7 100644 --- a/silx/gui/data/RecordTableView.py +++ b/silx/gui/data/RecordTableView.py @@ -37,7 +37,7 @@ from silx.gui.widgets.TableWidget import CopySelectedCellsAction __authors__ = ["V. Valls"] __license__ = "MIT" -__date__ = "27/01/2017" +__date__ = "02/10/2017" class _MultiLineItem(qt.QItemDelegate): @@ -206,9 +206,9 @@ class RecordTableModel(qt.QAbstractTableModel): data = data[key[1]] if role == qt.Qt.DisplayRole: - return self.__formatter.toString(data) + return self.__formatter.toString(data, dtype=self.__data.dtype) elif role == qt.Qt.EditRole: - return self.__editFormatter.toString(data) + return self.__editFormatter.toString(data, dtype=self.__data.dtype) return None def headerData(self, section, orientation, role=qt.Qt.DisplayRole): @@ -270,11 +270,11 @@ class RecordTableModel(qt.QAbstractTableModel): else: self.__is_array = False - self.__fields = [] if data is not None: if data.dtype.fields is not None: - for name, (dtype, _index) in data.dtype.fields.items(): + fields = sorted(data.dtype.fields.items(), key=lambda e: e[1][1]) + for name, (dtype, _index) in fields: if dtype.shape != tuple(): keys = itertools.product(*[range(x) for x in dtype.shape]) for key in keys: |