Changeset a95260d in sasview

Timestamp:

Jul 10, 2016 12:41:19 PM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

8cb6cd6

Parents:

0cd8612

Message:

Minor fixes

Location:

src/sas/qtgui

Files:

• MainWindow.py (modified) (3 diffs)
• Perspectives/Invariant/InvariantPerspective.py (modified) (1 diff)
• Plotter.py (modified) (2 diffs)
• UnitTesting/SasviewLoggerTest.py (modified) (2 diffs)

src/sas/qtgui/MainWindow.py

@@ -1 @@
-import sys
-
-from PyQt4 import QtGui
-
 # UNLESS EXEPTIONALLY REQUIRED TRY TO AVOID IMPORTING ANY MODULES HERE
 # ESPECIALLY ANYTHING IN SAS, SASMODELS NAMESPACE
+from PyQt4 import QtGui
 
 # Local UI
@@ -16 +13 @@
     def __init__(self, reactor, parent=None):
         super(MainSasViewWindow, self).__init__(parent)
-        
+
         # define workspace for dialogs.
         self.workspace = QtGui.QWorkspace(self)
@@ -28 +25 @@
         self.guiManager.quitApplication()
 
-        
+
 def SplashScreen():
     """

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -302 +302 @@
             variant_item = QtCore.QVariant(high_out_data)
             # This needs to run in the main thread
-            reactor.callFromThread(updateModelItem, self._model_item, variant_item, title)
+            reactor.callFromThread(GuiUtils.updateModelItem, self._model_item, variant_item, title)
 
         item = QtGui.QStandardItem(str(float('%.5g'% volume_fraction)))

src/sas/qtgui/Plotter.py

@@ -1 @@
-import sys
 from PyQt4 import QtGui
 
-# Replace the qt4agg calls below with qt5 equivalent.
+# TODO: Replace the qt4agg calls below with qt5 equivalent.
 # Requires some code modifications.
 # https://www.boxcontrol.net/embedding-matplotlib-plot-on-pyqt5-gui.html
@@ -9 +8 @@
 from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar
 import matplotlib.pyplot as plt
-
-import random
 
 class Plotter(QtGui.QDialog):

src/sas/qtgui/UnitTesting/SasviewLoggerTest.py

@@ -4 +4 @@
 
 from PyQt4.QtGui import *
-from PyQt4.QtTest import QTest
 from PyQt4.QtCore import *
 
@@ -27 +26 @@
 
 
-    def test_stdout(self):
+    def testQtHandler(self):
         """
         Test redirection of all levels of logging