Changeset 5e48acb in sasview

Timestamp:

Sep 23, 2011 11: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

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (3 diffs)
• fitpanel.py (modified) (2 diffs)
• fitproblem.py (modified) (4 diffs)
• fitting.py (modified) (6 diffs)

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

@@ -75 +75 @@
         self.mask = None
         self.uid = wx.NewId()
+        self.graph_id = None
         #Q range for data set
         self.qmin_data_set = None

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, 

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

@@ -536 +536 @@
             self._manager.sim_page=None 
             return
+        """
+        # The below is not working when delete #5 and still have #6.
         if selected_page.__class__.__name__ == "FitPage":
             self.fit_page_index -= 1
         else:
             self.batch_page_index -= 1
+        """
         ## closing other pages
         state = selected_page.createMemento()
@@ -575 +578 @@
                 break 
       
-  

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

@@ -117 +117 @@
         Return the caption of the page associated with object
         """
-        
+    def set_graph_id(self, id):
+        """
+        Set graph id (from data_group_id at the time the graph produced) 
+        """
+    def get_graph_id(self): 
+        """
+        Get graph_id
+        """  
    
 class FitProblemDictionary(FitProblemComponent, dict):
@@ -136 +143 @@
         self.qmin = None
         self.qmax = None
+        self.graph_id = None
         self._smear_on = False
         self.scheduled = 0
@@ -399 +407 @@
         return self.result
     
-
+    def set_graph_id(self, id):
+        """
+        Set graph id (from data_group_id at the time the graph produced) 
+        """
+        self.graph_id = id
+        
+    def get_graph_id(self): 
+        """
+        Get graph_id
+        """  
+        return self.graph_id
+    
+    
 class FitProblem(FitProblemComponent):
     """  
@@ -617 +637 @@
         return self.fit_tab_caption
     
-  
+    def set_graph_id(self, id):
+        """
+        Set graph id (from data_group_id at the time the graph produced) 
+        """
+        self.graph_id = id
+        
+    def get_graph_id(self): 
+        """
+        Get graph_id
+        """  
+        return self.graph_id
    

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

@@ -321 +321 @@
                 selected_data_list = data_list
             try:
+                group_id = wx.NewId()
                 for data in selected_data_list:
+                    if data is not None:
+                        data.group_id = group_id
+                    if group_id not in data.list_group_id:
+                        data.list_group_id.append(group_id)
                     page = self.add_fit_page(data=[data])
             except:
@@ -334 +339 @@
             self.parent.on_close_welcome_panel()
 
-             
+        
     def set_theory(self,  theory_list=None):
         """
@@ -435 +440 @@
         """
         self.page_finder[uid].set_param2fit(param2fit)
-                  
+        
+    def set_graph_id(self, uid, graph_id):
+        """
+        Set graph_id for fitprobelm
+        """
+        self.page_finder[uid].set_graph_id(graph_id)
+        
+    def get_graph_id(self, uid):
+        """
+        Set graph_id for fitprobelm
+        """
+        return self.page_finder[uid].get_graph_id()    
+                          
     def save_fit_state(self, filepath, fitstate):  
         """
@@ -978 +995 @@
         self.panel = event.GetEventObject()
         Plugin.on_perspective(self, event=event)
+        self.select_data(self.panel)
+        
+    def select_data(self, panel):
+        """
+        """
+        self.panel = panel
         for plottable in self.panel.graph.plottables:
             if plottable.__class__.__name__ in ["Data1D", "Theory1D"]:
@@ -1319 +1342 @@
             _xaxis, _xunit = data.get_xaxis() 
             new_plot.title = data.name
-            new_plot.group_id = data.group_id
+
+            new_plot.group_id = self.page_finder[page_id].get_graph_id()
+            if new_plot.group_id == None:
+                new_plot.group_id = data.group_id
             new_plot.id =  str(page_id) + "model"
             if new_plot.id in self.color_dict:
@@ -1631 +1657 @@
         new_plot.id = "res" + str(data_copy.id)#name + " residuals"
         ##group_id specify on which panel to plot this data
-        new_plot.group_id = new_plot.id
+        group_id = self.page_finder[page_id].get_graph_id()
+        if group_id == None:
+            group_id = data.group_id
+        new_plot.group_id ="res" + str(group_id)
         #new_plot.is_data = True
         ##post data to plot