Changeset 5236449 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

Timestamp:

Mar 8, 2017 7:35:49 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:

cbcdd2c

Parents:

86f88d1

Message:

Default datasets for fitting SASVIEW-498

File:

• src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -5 +5 @@
 from PyQt4 import QtGui
 
+import sas.qtgui.GuiUtils as GuiUtils
+
 from FittingWidget import FittingWidget
 
@@ -10 +12 @@
     """
     """
+    updateTheoryFromPerspectiveSignal =  QtCore.pyqtSignal(QtGui.QStandardItem)
     name = "Fitting" # For displaying in the combo box in DataExplorer
     def __init__(self, manager=None, parent=None, data=None):
@@ -41 +44 @@
         self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)
 
+        self.communicate = GuiUtils.Communicate()
+
     def addFit(self, data):
         """
         Add a new tab for passed data
         """
-        tab     = FittingWidget(manager=self.manager, parent=self.parent, data=data)
+        tab     = FittingWidget(manager=self.manager, parent=self.parent, data=data, id=self.maxIndex+1)
         self.tabs.append(tab)
         self.maxIndex += 1
         self.addTab(tab, self.tabName())
+        tab.signalTheory.connect(self.passSignal)
 
     def tabName(self):
@@ -77 +83 @@
         """
         Assign new dataset to the fitting instance
+        Obtain a QStandardItem object and dissect it to get Data1D/2D
+        Pass it over to the calculator
         """
         assert(data_item is not None)
 
-        # Find an unassigned tab.
+        if not isinstance(data_item, list):
+            msg = "Incorrect type passed to the Fitting Perspective"
+            raise AttributeError, msg
+
+        if not isinstance(data_item[0], QtGui.QStandardItem):
+            msg = "Incorrect type passed to the Fitting Perspective"
+            raise AttributeError, msg
+
+        self._model_item = data_item[0]
+
+        # Extract data on 1st child - this is the Data1D/2D component
+        data = GuiUtils.dataFromItem(self._model_item)
+
+        # self.model.item(WIDGETS.W_FILENAME).setData(QtCore.QVariant(self._model_item.text()))
+
+        # Find the first unassigned tab.
         # If none, open a new tab.
         available_tabs = list(map(lambda tab:tab.acceptsData(), self.tabs))
@@ -90 +113 @@
 
 
+    def passSignal(self, theory_item):
+        """
+        """
+        self.updateTheoryFromPerspectiveSignal.emit(theory_item)
+
 if __name__ == "__main__":
     app = QtGui.QApplication([])