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

Timestamp:

Mar 10, 2017 9:44:44 AM (8 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:

cd31251

Parents:

5236449

Message:

QModel items conversion into SasModel? parameters + data display SASVIEW-535

File:

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

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

@@ -12 +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):
@@ -44 +43 @@
         self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)
 
-        self.communicate = GuiUtils.Communicate()
+        #self.communicate = GuiUtils.Communicate()
+        self.communicate = self.parent.communicator()
 
     def addFit(self, data):
@@ -54 +54 @@
         self.maxIndex += 1
         self.addTab(tab, self.tabName())
-        tab.signalTheory.connect(self.passSignal)
 
     def tabName(self):
@@ -67 +66 @@
         Update local bookkeeping on tab close
         """
-        assert(len(self.tabs) >= index)
+        assert len(self.tabs) >= index
         # don't remove the last tab
         if len(self.tabs) <= 1:
@@ -86 +85 @@
         Pass it over to the calculator
         """
-        assert(data_item is not None)
+        assert data_item is not None
 
         if not isinstance(data_item, list):
@@ -98 +97 @@
         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))
+        available_tabs = list(map(lambda tab: tab.acceptsData(), self.tabs))
 
         if numpy.any(available_tabs):
@@ -111 +105 @@
         else:
             self.addFit(data_item)
-
-
-    def passSignal(self, theory_item):
-        """
-        """
-        self.updateTheoryFromPerspectiveSignal.emit(theory_item)
-
-if __name__ == "__main__":
-    app = QtGui.QApplication([])
-    dlg = FittingWindow()
-    dlg.show()
-    sys.exit(app.exec_())