Changeset fbfc488 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Nov 9, 2017 8:43:55 AM (6 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:

d6b8a1d

Parents:

7969b9c

git-author:

Piotr Rozyczko <rozyczko@…> (11/03/17 10:58:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:55)

Message:

More Qt5 related fixes.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (3 diffs)
• GuiManager.py (modified) (3 diffs)
• MainWindow.py (modified) (1 diff)

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
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -8 +8 @@
 from PyQt5.QtWidgets import *
 from PyQt5.QtGui import *
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import Qt, QLocale
 from PyQt5.QtWebKitWidgets import QWebView
 
@@ -198 +198 @@
 
         # Resize to the workspace height
-        #workspace_height = self._workspace.workspace.sizeHint().height()
-        #perspective_size = self._current_perspective.sizeHint()
+        workspace_height = self._workspace.workspace.sizeHint().height()
+        perspective_size = self._current_perspective.sizeHint()
         #if workspace_height < perspective_size.height():
-        #    perspective_width = perspective_size.width()
-        #    self._current_perspective.resize(perspective_width, workspace_height-10)
+        perspective_width = perspective_size.width()
+        self._current_perspective.resize(perspective_width, workspace_height-10)
 
         self._current_perspective.show()
@@ -592 +592 @@
         self.ipDockWidget.setObjectName("IPythonDockWidget")
         self.ipDockWidget.setWidget(terminal)
-        self._workspace.workspace.addSubWindow(self.ipDockWidget, Qt.RightDockWidgetArea)
+        self._workspace.addDockWidget(Qt.RightDockWidgetArea, self.ipDockWidget)
 
     def actionImage_Viewer(self):

src/sas/qtgui/MainWindow/MainWindow.py

@@ -69 +69 @@
     # Show the main SV window
     mainwindow = MainSasViewWindow()
-    mainwindow.showMaximized()
+    mainwindow.show()
 
     # no more splash screen