Changeset a281ab8 in sasview

Timestamp:

Jun 15, 2016 5:57:34 AM (9 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:

1042dba

Parents:

5032ea68

Message:

Prototype DE↔perspective api based on QStandardItem.

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (6 diffs)
• GuiUtils.py (modified) (1 diff)
• Perspectives/Invariant/InvariantPerspective.py (modified) (12 diffs)
• UnitTesting/DataExplorerTest.py (modified) (4 diffs)
• UnitTesting/GuiUtilsTest.py (modified) (1 diff)
• run_tests.sh (modified) (1 diff)

src/sas/qtgui/DataExplorer.py

@@ -16 +16 @@
 # UI
 from UI.TabbedFileLoadUI import DataLoadWidget
+
+# This is how to get data1/2D from the model item
+# data = [selected_items[0].child(0).data().toPyObject()]
 
 class DataExplorerWindow(DataLoadWidget):
@@ -150 +153 @@
             retval = msgbox.exec_()
             return
-        # Dig up data from model
-        data = [selected_items[0].child(0).data().toPyObject()]
+
+        # Dig up the item
+        data = selected_items
 
         # TODO
@@ -157 +161 @@
 
         # Notify the GuiManager about the send request
-        self._perspective.setData(data_list=data)
+        self._perspective.setData(data_item=data)
 
 
@@ -272 +276 @@
             message = "Loading Data Complete! "
         message += log_msg
-        return (output, message)
+        return output, message
 
     def getWlist(self):
@@ -375 +379 @@
 
 
-    def loadComplete(self, output, message=""):
+    def loadComplete(self, output):
         """
         Post message to status bar and update the data manager
         """
         self.model.reset()
+        assert(type(output), tuple)
+
+        output_data = output[0]
+        message = output[1]
         # Notify the manager of the new data available
         self.communicate.statusBarUpdateSignal.emit(message)
-        self.communicate.fileDataReceivedSignal.emit(output)
-        self.manager.add_data(data_list=output)
+        self.communicate.fileDataReceivedSignal.emit(output_data)
+        self.manager.add_data(data_list=output_data)
 
     def updateModel(self, data, p_file):
@@ -429 +437 @@
     def updateModelFromPerspective(self, model_item):
         """
-        """
-        # Overwrite the index with what we got from the perspective
+        Receive an update model item from a perspective
+        Make sure it is valid and if so, replace it in the model
+        """
+        # Assert the correct type
         if type(model_item) != QtGui.QStandardItem:
             msg = "Wrong data type returned from calculations."
             raise AttributeError, msg
+        # Assert other properties
+
+        # Remove the original item        
+
+        # Add the current item
         # self.model.insertRow(model_item)
+
         # Reset the view
         self.model.reset()

src/sas/qtgui/GuiUtils.py

@@ -205 +205 @@
 
     # New data in current perspective
-    updateModelFromPerspectiveSignal = QtCore.pyqtSignal(Data1D)
+    updateModelFromPerspectiveSignal = QtCore.pyqtSignal(QtGui.QStandardItem)
+
+def updateModelItem(item, update_data, name=""):
+    """
+    Updates QStandardItem with a checkboxed row named 'name'
+    and containing QVariant 'update_data'
+    """
+    assert type(item) == QtGui.QStandardItem
+    assert type(update_data) == QtCore.QVariant
+
+    checkbox_item = QtGui.QStandardItem(True)
+    checkbox_item.setCheckable(True)
+    checkbox_item.setCheckState(QtCore.Qt.Checked)
+    checkbox_item.setText(name)
+
+    # Add "Info" item
+    info_item = QtGui.QStandardItem("Info")
+
+    # Add the actual Data1D/Data2D object
+    object_item = QtGui.QStandardItem()
+    object_item.setData(update_data)
+
+    checkbox_item.setChild(0, object_item)
+
+    # Set info_item as the only child
+    checkbox_item.setChild(1, info_item)
+
+    # Append the new row to the main item
+    item.appendRow(checkbox_item)

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

@@ -12 +12 @@
 from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.qtgui.GuiUtils import Communicate
+from sas.qtgui.GuiUtils import updateModelItem
 
 # local
@@ -35 +36 @@
         self._model.appendRow(item)
 
-# class InvariantWindow(InvariantUI):
 class InvariantWindow(tabbedInvariantUI):
     # The controller which is responsible for managing signal slots connections
@@ -53 +53 @@
         self._manager = manager
         self._reactor = self._manager.reactor()
+        self._model_item = QtGui.QStandardItem()
 
         self._helpView = QtWebKit.QWebView()
@@ -119 +120 @@
         self._high_power_value  = float(self.model.item(WIDGETS.W_HIGHQ_POWER_VALUE).text())
 
-    def calculate(self):
+    def calculateInvariant(self):
         """
         Use twisted to thread the calculations away.
@@ -151 +152 @@
         """
         """
-        self._plotter.show()
+        if self._low_extrapolate or self._high_extrapolate:
+            self._plotter.show()
         self.model = model
         self.mapper.toFirst()
@@ -160 +162 @@
         self.pushButton.setStyleSheet(self.style)
 
-        # Send the new data to DE for keeping in the model
-        self.communicate.updateModelFromPerspectiveSignal.emit(self._data)
+        # Send the modified model item to DE for keeping in the model
+        self.communicate.updateModelFromPerspectiveSignal.emit(self._model_item)
 
 
@@ -255 +257 @@
 
             # Plot the chart
+            title = "Low-Q extrapolation"
             self._plotter.data(extrapolated_data)
-            self._plotter.title("Low-Q extrapolation")
+            self._plotter.title(title)
             self._plotter.plot()
 
+            # Add the plot to the model item
+            variant_item = QtCore.QVariant(self._plotter)
+            updateModelItem(self._model_item, variant_item, title)
 
         if self._high_extrapolate:
@@ -271 +277 @@
             # find how to add this plot to the existing plot for low_extrapolate
             # Plot the chart
+            title = "High-Q extrapolation"
             self._plotter.data(high_out_data)
-            self._plotter.title("High-Q extrapolation")
+            self._plotter.title(title)
             self._plotter.plot()
+
+            # Add the plot to the model item
+            variant_item = QtCore.QVariant(self._plotter)
+            updateModelItem(self._model_item, variant_item, title)
 
 
@@ -326 +337 @@
 
     def setupSlots(self):
-        self.pushButton.clicked.connect(self.calculate)
+        self.pushButton.clicked.connect(self.calculateInvariant)
         self.pushButton_2.clicked.connect(self.status)
         self.pushButton_3.clicked.connect(self.help)
@@ -489 +500 @@
         self.mapper.toFirst()
 
-    def setData(self, data_list=None):
+    def setData(self, data_item):
+        """
+        Obtain a QStandardItem object and dissect it to get Data1D/2D
+        Pass it over to the calculator
+        """
+        if not isinstance(data_item, list):
+            msg = "Incorrect type passed to the Invariant Perspective"
+            raise AttributeError, msg
+
+        if not isinstance(data_item[0], QtGui.QStandardItem):
+            msg = "Incorrect type passed to the Invariant Perspective"
+            raise AttributeError, msg
+
+        self._model_item = data_item[0]
+
+        # Extract data on 1st child - this is the Data1D/2D component
+        data = self._model_item.child(0).data().toPyObject()
+
+        self.calculate(data_list=[data])
+        
+    def calculate(self, data_list=None):
         """
         receive a list of data and compute invariant
+
+        TODO: pass warnings/messages to log
         """
         msg = ""
@@ -520 +553 @@
                     #wx.PostEvent(self.parent, StatusEvent(status=msg, info='error'))
                     return
-                msg += "Invariant panel does not allow multiple data!\n"
-                msg += "Please select one.\n"
+
+                # TODO: add msgbox for data choice
+                #msg += "Invariant panel does not allow multiple data!\n"
+                #msg += "Please select one.\n"
                 #if len(data_list) > 1:
                     #from invariant_widgets import DataDialog
@@ -545 +580 @@
                     self._data = data
                     self._path = "unique path"
-                    self.calculate()
+                    self.calculateInvariant()
                 except:
                     msg = "Invariant Set_data: " + str(sys.exc_value)

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -1 +1 @@
 import sys
 import unittest
-#from twisted.trial import unittest
-#from twisted.internet import reactor, defer, interfaces, threads, protocol, error
 
 from PyQt4.QtGui import *
@@ -27 +25 @@
             def allowBatch(self):
                 return False
-            def setData(self, data_list=None):
+            def setData(self, data_item=None):
                 return None
             def title(self):
@@ -271 +269 @@
         """
 
+        message="Loading Data Complete"
         data_dict = {"a1":Data1D()}
+        output_data = (data_dict, message)
 
         self.form.manager.add_data = MagicMock()
@@ -280 +280 @@
 
         # Read in the file
-        self.form.loadComplete(data_dict, message="Loading Data Complete")
+        self.form.loadComplete(output_data)
 
         # "Loading data complete" no longer sent in LoadFile but in callback

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ +1 @@
+import sys
+import unittest
+
+# Tested module
+from GuiUtils import *
+
+class GuiUtilsTest(unittest.TestCase):
+    '''Test the GUI Utilities methods'''
+    def setUp(self):
+        '''Empty'''
+        pass
+
+    def tearDown(self):
+        '''empty'''
+        pass
+
+    def testDefaults(self):
+        """
+        Test all the global constants defined in the file.
+        """
+        # Should probably test the constants in the file,
+        # but this will done after trimming down GuiUtils
+        # and retaining only necessary variables.
+        pass
+
+    def testGetAppDir(self):
+        """
+        """
+        pass
+
+    def testGetUserDirectory(self):
+        """
+        Simple test of user directory getter
+        """
+        home_dir = os.path.expanduser("~")
+        self.assertIn(home_dir, get_user_directory())
+
+    def testCommunicate(self):
+        """
+        Test the container class with signal definitions
+        """
+        com = Communicate()
+
+        # All defined signals
+        list_of_signals = [
+            'fileReadSignal',
+            'fileDataReceivedSignal',
+            'statusBarUpdateSignal',
+            'updatePerspectiveWithDataSignal',
+            'updateModelFromPerspectiveSignal'
+        ]
+
+        # Assure all signals are defined.
+        for signal in list_of_signals:
+            self.assertIn(signal, dir(com))
+
+
+    def testUpdateModelItem(self):
+        """
+        Test the QModelItem update method
+        """
+        test_item = QtGui.QStandardItem()
+        test_list = ['aa','11']
+        update_data = QtCore.QVariant(test_list)
+        name = "Black Sabbath"
+
+        # update the item
+        updateModelItem(test_item, update_data, name)
+        
+        # Make sure test_item got all data added
+        self.assertEqual(test_item.child(0).text(), name)
+        self.assertTrue(test_item.child(0).isCheckable())
+        list_from_item = test_item.child(0).child(0).data().toPyObject()
+        self.assertIsInstance(list_from_item, list)
+        self.assertEqual(str(list_from_item[0]), test_list[0])
+        self.assertEqual(str(list_from_item[1]), test_list[1])
+
+if __name__ == "__main__":
+    unittest.main()
+

src/sas/qtgui/run_tests.sh

@@ -1 @@
-# python -m UnitTesting.TestUtilsTest
-# python -m UnitTesting.WelcomePanelTest
+python -m UnitTesting.TestUtilsTest
+python -m UnitTesting.WelcomePanelTest
 python -m UnitTesting.DataExplorerTest
-# python -m UnitTesting.GuiManagerTest
-# python -m UnitTesting.MainWindowTest
+python -m UnitTesting.GuiManagerTest
+python -m UnitTesting.MainWindowTest
+python -m UnitTesting.GuiUtilsTest