Changeset 39551a68 in sasview

Timestamp:

Aug 1, 2016 9:47:16 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:

1af348e

Parents:

28a84e9

Message:

More context menu functionality + tests

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (1 diff)
• GuiUtils.py (modified) (3 diffs)
• Plotter.py (modified) (2 diffs)
• UnitTesting/DataExplorerTest.py (modified) (1 diff)
• UnitTesting/GuiUtilsTest.py (modified) (2 diffs)

src/sas/qtgui/DataExplorer.py

@@ -689 +689 @@
     def quickDataPlot(self):
         """
-        """
-        print "quickDataPlot"
-        pass
+        Frozen plot - display an image of the plot
+        """
+        index = self.treeView.selectedIndexes()[0]
+        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        data = model_item.child(0).data().toPyObject()
+
+        dimension = 1 if isinstance(data, Data1D) else 2
+
+        # TODO: Replace this with the proper MaskPlotPanel from plottools
+        new_plot = Plotter(self)
+        new_plot.data(data)
+        new_plot.plot(marker='o', linestyle='')
+
+        # Update the global plot counter
+        title = "Plot " + data.name
+        new_plot.setWindowTitle(title)
+
+        # Show the plot
+        new_plot.show()
 
     def quickData3DPlot(self):

src/sas/qtgui/GuiUtils.py

@@ -388 +388 @@
 def retrieveData2d(data):
     """
-    Retrieve 1D data from file and construct its text
+    Retrieve 2D data from file and construct its text
     representation
     """
+    if not isinstance(data, Data2D):
+        msg = "Incorrect type passed to retrieveData2d"
+        raise AttributeError, msg
+
     text = data.__str__()
     text += 'Data Min Max:\n'
@@ -428 +432 @@
     return text
 
-def _onTXTSave(data, path):
+def onTXTSave(data, path):
     """
     Save file as formatted txt
@@ -499 +503 @@
     loader = Loader()
     if os.path.splitext(filename)[1].lower() == ".txt":
-        _onTXTSave(data, filename)
+        onTXTSave(data, filename)
     if os.path.splitext(filename)[1].lower() == ".xml":
         loader.save(filename, data, ".xml")

src/sas/qtgui/Plotter.py

@@ -78 +78 @@
         self._ax = self.figure.add_subplot(self._current_plot)
 
-    def plot(self):
+    def plot(self, marker=None, linestyle=None):
         """
         Plot self._data
@@ -85 +85 @@
         ax = self._ax
 
+        if marker == None:
+            marker = '*'
+
+        if linestyle == None:
+            linestyle = '-'
+
         # plot data with legend
-        ax.plot(self._data.x, self._data.y, '*-', label=self._title)
+        ax.plot(self._data.x, self._data.y, marker=marker, linestyle=linestyle, label=self._title)
 
         # Now add the legend with some customizations.

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -723 +723 @@
         QFileDialog.getSaveFileName.assert_called_once()
 
+    def testQuickDataPlot(self):
+        """
+        Quick data plot generation.
+
+        TODO: add content once plotting finalized
+        """
+        pass
 
 if __name__ == "__main__":

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ -10 +10 @@
 from sas.sascalc.dataloader.loader import Loader
 from sas.sasgui.guiframe.data_manager import DataManager
+from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.dataFitting import Data2D
 
 # Tested module
 from GuiUtils import *
 
-class FakeData(object):
-    '''Data1D/2D object for testing'''
-    def __init__(self):
-        self.x = []
-        self.y = []
+app = QtGui.QApplication(sys.argv)
 
 class GuiUtilsTest(unittest.TestCase):
@@ -198 +196 @@
         """
         """
-        self.assertRaises(retrieveData1d("BOOP"))
-
-        # data = FakeData()        
-        pass
+        with self.assertRaises(AttributeError):
+            retrieveData1d("BOOP")
+
+        data = Data1D()
+        with self.assertRaises(ValueError):
+            retrieveData1d(data)
+
+        data = Data1D(x=[1.0, 2.0, 3.0], y=[10.0, 11.0, 12.0])
+
+        text = retrieveData1d(data)
+
+        self.assertIn("Temperature:", text)
+        self.assertIn("Beam_size:", text)
+        self.assertIn("X_min = 1.0:  X_max = 3.0", text)
+        self.assertIn("3.0 \t12.0 \t0.0 \t0.0", text)
 
     def testRetrieveData2d(self):
         """
         """
-        pass
+        with self.assertRaises(AttributeError):
+            retrieveData2d("BOOP")
+        data = Data2D(image=[1.0, 2.0, 3.0],
+                      err_image=[0.01, 0.02, 0.03],
+                      qx_data=[0.1, 0.2, 0.3],
+                      qy_data=[0.1, 0.2, 0.3])
+
+        text = retrieveData2d(data)
+
+        self.assertIn("Type:         Data2D", text)
+        self.assertIn("I_min = 1.0", text)
+        self.assertIn("I_max = 3.0", text)
+        self.assertIn("2 \t0.3 \t0.3 \t3.0 \t0.03 \t0.0 \t0.0", text)
 
     def testOnTXTSave(self):
         """
-        """
-        pass
+        Test the file writer for saving 1d/2d data
+        """
+        path = "test123"
+        if os.path.isfile(path):
+            os.remove(path)
+
+        # Broken data
+        data = Data1D(x=[1.0, 2.0, 3.0], y=[])
+        # Expect a raise
+        with self.assertRaises(IndexError):
+            onTXTSave(data, path)
+
+        # Good data - no dX/dY
+        data = Data1D(x=[1.0, 2.0, 3.0], y=[10.0, 11.0, 12.0])
+        onTXTSave(data, path)
+
+        self.assertTrue(os.path.isfile(path))
+        with open(path,'r') as out:
+            data_read = out.read()
+            self.assertEqual("<X>   <Y>\n1  10\n2  11\n3  12\n", data_read)
+
+        if os.path.isfile(path):
+            os.remove(path)
+
+        # Good data - with dX/dY
+        data = Data1D(x=[1.0, 2.0, 3.0], y=[10.0, 11.0, 12.0],
+                      dx=[0.1, 0.2, 0.3], dy=[0.1, 0.2, 0.3])
+
+        onTXTSave(data, path)
+        with open(path,'r') as out:
+            data_read = out.read()
+            self.assertIn("<X>   <Y>   <dY>   <dX>\n", data_read)
+            self.assertIn("1  10  0.1  0.1\n", data_read)
+            self.assertIn("2  11  0.2  0.2\n", data_read)
+            self.assertIn("3  12  0.3  0.3\n", data_read)
+
+        if os.path.isfile(path):
+            os.remove(path)
 
     def testSaveData1D(self):
         """
-        """
-        pass
+        Test the 1D file save method
+        """
+        data = Data1D(x=[1.0, 2.0, 3.0], y=[10.0, 11.0, 12.0],
+                      dx=[0.1, 0.2, 0.3], dy=[0.1, 0.2, 0.3])
+
+        # Test the .txt format
+        file_name = "test123_out.txt"
+        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        data.filename = "test123.txt"
+        saveData1D(data)
+        self.assertTrue(os.path.isfile(file_name))
+        os.remove(file_name)
+
+        # Test the .xml format
+        file_name = "test123_out.xml"
+        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        data.filename = "test123.xml"
+        saveData1D(data)
+        self.assertTrue(os.path.isfile(file_name))
+        os.remove(file_name)
+
+        # Test the wrong format
+        file_name = "test123_out.mp3"
+        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        data.filename = "test123.mp3"
+        saveData1D(data)
+        self.assertFalse(os.path.isfile(file_name))
 
     def testSaveData2D(self):
         """
-        """
-        pass
+        Test the 1D file save method
+        """
+        data = Data2D(image=[1.0, 2.0, 3.0],
+                      err_image=[0.01, 0.02, 0.03],
+                      qx_data=[0.1, 0.2, 0.3],
+                      qy_data=[0.1, 0.2, 0.3])
+
+        # Test the .txt format
+        file_name = "test123_out.dat"
+        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        data.filename = "test123.dat"
+        saveData2D(data)
+        self.assertTrue(os.path.isfile(file_name))
+        os.remove(file_name)
+
+        # Test the wrong format
+        file_name = "test123_out.mp3"
+        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=file_name)
+        data.filename = "test123.mp3"
+        saveData2D(data)
+        self.assertFalse(os.path.isfile(file_name))
+
 
 if __name__ == "__main__":