Changeset a281ab8 in sasview for src/sas/qtgui/Perspectives/Invariant

Timestamp:

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

1042dba

Parents:

5032ea68

Message:

Prototype DE↔perspective api based on QStandardItem.

File:

• src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (modified) (12 diffs)

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)