Changeset adf81b8 in sasview for src/sas

Timestamp:

Nov 29, 2016 8:08:29 AM (8 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:

8548d739

Parents:

e84ccf5

git-author:

Piotr Rozyczko <rozyczko@…> (11/29/16 02:56:47)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/29/16 08:08:29)

Message:

Minor performance impromevements in DE

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (4 diffs)
• UnitTesting/WelcomePanelTest.py (modified) (3 diffs)

src/sas/qtgui/DataExplorer.py

@@ -293 +293 @@
         self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
 
+        def isItemReady(index):
+            item = self.model.item(index)
+            return item.isCheckable() and item.checkState() == QtCore.Qt.Checked
+
         # Figure out which rows are checked
-        selected_items = []
-        for index in range(self.model.rowCount()):
-            item = self.model.item(index)
-            if item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
-                selected_items.append(item)
+        selected_items = [self.model.item(index)
+                          for index in xrange(self.model.rowCount())
+                          if isItemReady(index)]
 
         if len(selected_items) < 1:
@@ -312 +314 @@
             retval = msgbox.exec_()
             return
-
-        # TODO
-        # New plot or appended?
 
         # Notify the GuiManager about the send request
@@ -378 +377 @@
         self.cbgraph.clear()
         graph_titles = []
-        for graph in graph_list:
-            graph_titles.append("Graph"+str(graph))
+        graph_titles= ["Graph"+str(graph) for graph in graph_list]
+
         self.cbgraph.insertItems(0, graph_titles)
         ind = self.cbgraph.findText(orig_text)
@@ -395 +394 @@
         # All same-type charts in one plot
         new_plot = Plotter(self)
+
+        def addDataPlot(plot, plot_set):
+            plot.data = plot_set
+            plot.plot()
+
+        def addDataPlot2D(plot_set):
+            plot2D = Plotter2D(self)
+            addDataPlot(plot2D, plot_set)
+            self.plotAdd(plot2D)
+
         for plot_set in plots:
             if isinstance(plot_set, Data1D):
-                new_plot.data = plot_set
-                new_plot.plot()
+                addDataPlot(new_plot, plot_set)
             elif isinstance(plot_set, Data2D):
-                # Separate 2D plot
-                plot2D = Plotter2D(self)
-                plot2D.data = plot_set
-                plot2D.plot()
-                self.plotAdd(plot2D)
+                addDataPlot2D(plot_set)
             else:
                 msg = "Incorrect data type passed to Plotting"
                 raise AttributeError, msg
+
 
         if plots and \

src/sas/qtgui/UnitTesting/WelcomePanelTest.py

@@ -2 +2 @@
 import unittest
 
-from PyQt4.QtGui import *
-from PyQt4.QtTest import QTest
-from PyQt4.QtCore import *
+from PyQt4 import QtGui
 
 # set up import paths
@@ -12 +10 @@
 from WelcomePanel import WelcomePanel
 
-app = QApplication(sys.argv)
+app = QtGui.QApplication(sys.argv)
 
 class WelcomePanelTest(unittest.TestCase):
@@ -28 +26 @@
     def testDefaults(self):
         '''Test the GUI in its default state'''
-        self.assertIsInstance(self.widget, QDialog)
+        self.assertIsInstance(self.widget, QtGui.QDialog)
         self.assertEqual(self.widget.windowTitle(), "Welcome")
         
     def testVersion(self):
-        """
-        """
+        '''Test the version string'''
         version = self.widget.lblVersion
-        self.assertIsInstance(version, QLabel)
-        ver_text = "\nSasView 4.0.0-alpha\nBuild: 1\n(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and IL"
-        #self.assertEqual(str(version.text()), ver_text)
-        self.assertIn("SasView", str(version.text()))
-        self.assertIn("Build:", str(version.text()))
+        self.assertIsInstance(version, QtGui.QLabel)
+
+        self.assertIn("SasView", version.text())
+        self.assertIn("Build:", version.text())
+        self.assertIn("UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO", version.text())
        
 if __name__ == "__main__":