Changeset 6280464 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Nov 3, 2017 10:58:39 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

412e069e

Parents:

304d082

Message:

More Qt5 related fixes.

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -218 +218 @@
             'options'   : QtWidgets.QFileDialog.DontUseNativeDialog
         }
-        filename = str(QtWidgets.QFileDialog.getOpenFileName(**kwargs))
+        filename = QtWidgets.QFileDialog.getOpenFileName(**kwargs)[0]
         if filename:
             load_thread = threads.deferToThread(self.readProject, filename)
@@ -582 +582 @@
         # Show the plot
         new_plot.show()
+        new_plot.canvas.draw()
 
         # Update the active chart list
@@ -628 +629 @@
         paths = QtWidgets.QFileDialog.getOpenFileNames(self, "Choose a file", "",
                 wlist, None, QtWidgets.QFileDialog.DontUseNativeDialog)[0]
-        # [0] is new in Qt5 as getOpenFileNames() returns now a tuple!
-        if paths is None:
+        if not paths:
             return