Changeset 464cd07 in sasview for src/sas/qtgui/Calculators

Timestamp:

Aug 22, 2017 5:59:29 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:

b2a5042

Parents:

457d961

Message:

Use singleton QApplication in unit tests to avoid issues on Ubuntu. SASVIEW-485

Location:

src/sas/qtgui/Calculators

Files:

• GenericScatteringCalculator.py (modified) (1 diff, 1 prop)
• UnitTesting/DensityCalculatorTest.py (modified) (1 diff)
• UnitTesting/GenericScatteringCalculatorTest.py (modified) (1 diff, 1 prop)
• UnitTesting/KiessigCalculatorTest.py (modified) (1 diff)
• UnitTesting/SLDCalculatorTest.py (modified) (1 diff)
• UnitTesting/SlitSizeCalculatorTest.py (modified) (2 diffs)

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -100 +100 @@
 
         # plots - 3D in real space
-        self.trigger_plot_3d.connect(lambda: self.plot3d(has_arrow=False))
+        plot3d = self.plot3d(has_arrow=False)
+        self.trigger_plot_3d.connect(plot3d)
+        #self.trigger_plot_3d.connect(lambda: self.plot3d(has_arrow=False))
 
         self.graph_num = 1  # index for name of graph

src/sas/qtgui/Calculators/UnitTesting/DensityCalculatorTest.py

@@ -19 +19 @@
 import sas.qtgui.Utilities.LocalConfig
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class ToMolarMassTest(unittest.TestCase):

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -24 +24 @@
 from sas.sascalc.calculator import sas_gen
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 

src/sas/qtgui/Calculators/UnitTesting/KiessigCalculatorTest.py

@@ -11 +11 @@
 from sas.qtgui.Calculators.KiessigPanel import KiessigPanel
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 

src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

@@ -20 +20 @@
 import sas.qtgui.Utilities.LocalConfig
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class SldResultTest(unittest.TestCase):

src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

@@ -12 +12 @@
 from sas.sascalc.dataloader.loader import Loader
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 
@@ -87 +88 @@
                                 self.widget.calculateSlitSize, data)
 
-        filename = "empty_file.txt"
-        loader = Loader()
-        data = loader.load(filename)
-        self.assertRaisesRegexp(RuntimeError,
-                                "ERROR: Data hasn't been loaded correctly",
-                                self.widget.calculateSlitSize, data)
-
         data = None
         self.assertRaisesRegexp(RuntimeError,