Changeset 68c96d3 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Mar 1, 2017 5:17:07 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:

6f7f652

Parents:

f46f6dc

Message:

fix the data passing to fitting

File:

• src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (modified) (1 diff)

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

@@ -73 +73 @@
         return True
 
-    def setData(self, data=None):
+    def setData(self, data_item=None):
         """
         Assign new dataset to the fitting instance
         """
-        assert(data is not None)
+        assert(data_item is not None)
 
-        # find an unassigned tab.
-        # if none, open a new tab.
-        tab_to_send = None
-        for tab in self.tabs:
-            if tab.acceptsData():
-                tab_to_send = tab
-                break
-        # send data
-        if tab_to_send is None:
-            self.addFit(data)
+        # Find an unassigned tab.
+        # If none, open a new tab.
+        available_tabs = list(map(lambda tab:tab.acceptsData(), self.tabs))
+
+        if True in available_tabs:
+            self.tabs[available_tabs.index(True)].data = data_item
         else:
-            tab_to_send.data = data
-        pass
+            self.addFit(data_item)
+
 
 if __name__ == "__main__":