diff options
| author | Picca Frédéric-Emmanuel <picca@debian.org> | 2017-10-07 07:59:01 +0200 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@debian.org> | 2017-10-07 07:59:01 +0200 |
| commit | bfa4dba15485b4192f8bbe13345e9658c97ecf76 (patch) | |
| tree | fb9c6e5860881fbde902f7cbdbd41dc4a3a9fb5d /silx/gui/data/ArrayTableModel.py | |
| parent | f7bdc2acff3c13a6d632c28c4569690ab106eed7 (diff) | |
New upstream version 0.6.0+dfsg
Diffstat (limited to 'silx/gui/data/ArrayTableModel.py')
| -rw-r--r-- | silx/gui/data/ArrayTableModel.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/silx/gui/data/ArrayTableModel.py b/silx/gui/data/ArrayTableModel.py index 87a2fc1..ad4d33a 100644 --- a/silx/gui/data/ArrayTableModel.py +++ b/silx/gui/data/ArrayTableModel.py @@ -34,7 +34,7 @@ from silx.gui.data.TextFormatter import TextFormatter __authors__ = ["V.A. Sole"] __license__ = "MIT" -__date__ = "24/01/2017" +__date__ = "27/09/2017" _logger = logging.getLogger(__name__) @@ -191,7 +191,7 @@ class ArrayTableModel(qt.QAbstractTableModel): selection = self._getIndexTuple(index.row(), index.column()) if role == qt.Qt.DisplayRole: - return self._formatter.toString(self._array[selection]) + return self._formatter.toString(self._array[selection], self._array.dtype) if role == qt.Qt.BackgroundRole and self._bgcolors is not None: r, g, b = self._bgcolors[selection][0:3] @@ -296,6 +296,9 @@ class ArrayTableModel(qt.QAbstractTableModel): elif copy: # copy requested (default) self._array = numpy.array(data, copy=True) + if hasattr(data, "dtype"): + # Avoid to lose the monkey-patched h5py dtype + self._array.dtype = data.dtype elif not _is_array(data): raise TypeError("data is not a proper array. Try setting" + " copy=True to convert it into a numpy array" + |