Changeset 8cb6cd6 in sasview for src/sas/qtgui/UnitTesting

Timestamp:

Jul 12, 2016 8:44:53 AM (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:

e3ae090

Parents:

a95260d

Message:

Plot handler prototype + append plot functionality

Location:

src/sas/qtgui/UnitTesting

Files:

• DataExplorerTest.py (modified) (5 diffs)
• PlotHelperTest.py (added)

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -17 +17 @@
 from UnitTesting.TestUtils import QtSignalSpy
 from Plotter import Plotter
+import PlotHelper
 
 app = QApplication(sys.argv)
@@ -39 +40 @@
             def perspective(self):
                 return MyPerspective()
+            def workspace(self):
+                return None
 
         self.form = DataExplorerWindow(None, dummy_manager())
@@ -505 +508 @@
         loader = Loader()
         manager = DataManager()
+        PlotHelper.clear()
+        self.form.enableGraphCombo(None)
+
+        # Make sure the controls are disabled
+        self.assertFalse(self.form.cbgraph.isEnabled())
+        self.assertFalse(self.form.cmdAppend.isEnabled())
 
         # get Data1D
@@ -517 +526 @@
         self.form.plotsFromCheckedItems = MagicMock(return_value=new_data)
 
+        # Mask plotting
+        self.form.parent.workspace = MagicMock()
+
         # Call the plotting method
         self.form.newPlot()
@@ -522 +534 @@
         # The plot was displayed
         self.assertTrue(Plotter.show.called)
+
+        # The plot was registered
+        self.assertEqual(len(PlotHelper.currentPlots()), 1)
+
+        self.assertTrue(self.form.cbgraph.isEnabled())
+        self.assertTrue(self.form.cmdAppend.isEnabled())
+
+    def testAppendPlot(self):
+        """
+        Creating new plots from Data1D/2D
+        """
+        loader = Loader()
+        manager = DataManager()
+
+        PlotHelper.clear()
+        self.form.enableGraphCombo(None)
+
+        # Make sure the controls are disabled
+        self.assertFalse(self.form.cbgraph.isEnabled())
+        self.assertFalse(self.form.cmdAppend.isEnabled())
+
+        # get Data1D
+        p_file="cyl_400_20.txt"
+        output_object = loader.load(p_file)
+        new_data = [manager.create_gui_data(output_object, p_file)]
+
+        # Mask plotting
+        self.form.parent.workspace = MagicMock()
+
+        # Mask the plot show call
+        Plotter.show = MagicMock()
+
+        # Mask retrieval of the data
+        self.form.plotsFromCheckedItems = MagicMock(return_value=new_data)
+
+        # Call the plotting method
+        self.form.newPlot()
+
+        # Call the plotting method again, so we have 2 graphs
+        self.form.newPlot()
+
+        # See that we have two plots
+        self.assertEqual(len(PlotHelper.currentPlots()), 2)
+
+        # Add data to plot #1
+        self.form.cbgraph.setCurrentIndex(1)
+        self.form.appendPlot()
+
+        # See that we still have two plots
+        self.assertEqual(len(PlotHelper.currentPlots()), 2)
+
+    def testUpdateGraphCombo(self):
+        """
+        Test the combo box update
+        """
+        PlotHelper.clear()
+
+        graph_list=[1,2,3]
+        self.form.updateGraphCombo(graph_list)
+
+        self.assertEqual(self.form.cbgraph.count(), 3)
+        self.assertEqual(self.form.cbgraph.currentText(), 'Graph1')
+
+        graph_list=[]
+        self.form.updateGraphCombo(graph_list)
+        self.assertEqual(self.form.cbgraph.count(), 0)
 
     def testUpdateModelFromPerspective(self):