Changeset 5e48acb in sasview for fittingview/src/sans/perspectives/fitting/fitpage.py

Timestamp:

Sep 23, 2011 9:44:39 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d03a356

Parents:

22ce7e2

Message:

fixed group_id related problem when set data in fitpage and added feature that send multiple data sets on import

File:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -1804 +1804 @@
         reset the current data 
         """
+        from sans.guiframe.dataFitting import check_data_validity
         id = None
-        group_id = None
         flag = False
+        is_data = False
         if self.data is not None:
-            group_id = self.data.group_id
-           
-        if self.data is None and data is not None:
+            is_data = check_data_validity(self.data)  
+        if not is_data and data is not None:
                 flag = True
         if data is not None:
             id = data.id
-            if self.data is not None:
+            if is_data:
+                self.graph_id = self.data.group_id
                 flag = (data.id != self.data.id)
         self.data = data
-        self.data.group_id = group_id
+        if check_data_validity(data):
+            self.graph_id = data.group_id
+        self.data.group_id = self.graph_id
+        
         if self.data is None:
             data_min = ""
@@ -1905 +1909 @@
         self.state.qmax = self.qmax_x
         self.enable_fit_button()
+        # send graph_id to page_finder 
+        self._manager.set_graph_id(uid=self.uid, graph_id=self.graph_id)
         #update model plot with new data information
         if flag:
@@ -1918 +1924 @@
             #by removing the previous selected data
             wx.PostEvent(self._manager.parent, NewPlotEvent(action="remove",
-                                                    group_id=group_id, id=id))
+                                                    group_id=self.graph_id, id=id))
             #plot the current selected data
             wx.PostEvent(self._manager.parent, NewPlotEvent(plot=self.data,