diff options
| author | Picca Frédéric-Emmanuel <picca@debian.org> | 2021-01-06 14:10:12 +0100 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@debian.org> | 2021-01-06 14:10:12 +0100 |
| commit | b3bea947efa55d2c0f198b6c6795b3177be27f45 (patch) | |
| tree | 4116758aafe4483bf472c1d54b519e685737fd77 /silx/app | |
| parent | 5ad425ff4e62f5e003178813ebd073577679a00e (diff) | |
New upstream version 0.14.0+dfsg
Diffstat (limited to 'silx/app')
| -rw-r--r-- | silx/app/test/test_convert.py | 4 | ||||
| -rw-r--r-- | silx/app/view/Viewer.py | 2 | ||||
| -rw-r--r-- | silx/app/view/main.py | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/silx/app/test/test_convert.py b/silx/app/test/test_convert.py index bb1ae99..857f30c 100644 --- a/silx/app/test/test_convert.py +++ b/silx/app/test/test_convert.py @@ -40,7 +40,7 @@ import h5py import silx from .. import convert from silx.utils import testutils - +from silx.io.utils import h5py_read_dataset # content of a spec file @@ -137,7 +137,7 @@ class TestConvertCommand(unittest.TestCase): self.assertTrue(os.path.isfile(h5name)) with h5py.File(h5name, "r") as h5f: - title12 = h5f["/1.2/title"][()] + title12 = h5py_read_dataset(h5f["/1.2/title"]) if sys.version_info < (3, ): title12 = title12.encode("utf-8") self.assertEqual(title12, diff --git a/silx/app/view/Viewer.py b/silx/app/view/Viewer.py index 9503533..dd4d075 100644 --- a/silx/app/view/Viewer.py +++ b/silx/app/view/Viewer.py @@ -116,6 +116,8 @@ class Viewer(qt.QMainWindow): spliter.addWidget(rightPanel) spliter.addWidget(self.__dataPanel) spliter.setStretchFactor(1, 1) + spliter.setCollapsible(0, False) + spliter.setCollapsible(1, False) self.__splitter = spliter main_panel = qt.QWidget(self) diff --git a/silx/app/view/main.py b/silx/app/view/main.py index c7afc19..a1369c1 100644 --- a/silx/app/view/main.py +++ b/silx/app/view/main.py @@ -1,6 +1,6 @@ # coding: utf-8 # /*########################################################################## -# Copyright (C) 2016-2019 European Synchrotron Radiation Facility +# Copyright (C) 2016-2020 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -57,7 +57,7 @@ def createParser(): default=False, help='Use OpenGL for plots (instead of matplotlib)') parser.add_argument( - '--fresh', + '-f', '--fresh', dest="fresh_preferences", action="store_true", default=False, @@ -104,7 +104,7 @@ def mainQt(options): from silx.gui import qt # Make sure matplotlib is configured # Needed for Debian 8: compatibility between Qt4/Qt5 and old matplotlib - from silx.gui.plot import matplotlib + import silx.gui.utils.matplotlib # noqa app = qt.QApplication([]) qt.QLocale.setDefault(qt.QLocale.c()) |