Changeset ae4ade7 in sasview

Timestamp:

Mar 10, 2011 6:10:12 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

aae7a8d

Parents:

2bdb52b

Message:

work on toggle 1D \2D

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (3 diffs)
• fitting.py (modified) (7 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -249 +249 @@
         panel.populate_box(dict=self.model_list_box)
         panel.set_manager(self._manager)
-        self.AddPage(panel, panel.window_name, select=True)
+        caption = str(panel.window_name) + " " + str(self._manager.index_model)
+        self.AddPage(panel, caption, select=True)
         self.opened_pages[panel.id] = panel
         return panel 
@@ -276 +277 @@
                     self.SetSelection(pos)
                     return page
+                
             elif page.get_data().id == data.id:
                 msg = "Data already existing in the fitting panel"
@@ -289 +291 @@
         self.SetPageText(pos, str(data.name))
         self.opened_pages[page.id] = page
+        
         return page
        

sansview/perspectives/fitting/fitting.py

@@ -93 +93 @@
         #keep reference of the simultaneous fit page
         self.sim_page = None
-   
+        self.index_model = 0
         #Create a reader for fit page's state
         self.state_reader = None 
@@ -637 +637 @@
         get this page and store it into the page_finder of this plug-in
         """
-        
         page = self.fit_panel.set_data(data)
         page_caption = page.window_name
@@ -655 +654 @@
                              NewPlotEvent(group_id=group_id,
                                                action="delete"))
+                    self.parent.update_data(prev_data=theory_data, new_data=data)      
             else:
                 if theory_data is not None:
@@ -666 +666 @@
                              NewPlotEvent(group_id=group_id,
                                                action="delete"))
-            
-            self.parent.update_data(prev_data=theory_data, new_data=data)       
+                    self.parent.update_data(prev_data=theory_data, new_data=data)       
         self.store_data(id=page.id, data=data, caption=page.window_name)
         if self.sim_page is not None:
@@ -995 +994 @@
         qmax = evt.qmax
         smearer = evt.smearer
+        
         if model == None:
             return
@@ -1170 +1170 @@
             self.parent.append_theory(data_id=data_id, 
                                           theory=new_plot, state=state)
-            
+            current_pg = self.fit_panel.get_page_by_id(id)
+            title = new_plot.title
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
-                                            title= str(new_plot.title)))
-            current_pg = self.fit_panel.get_page_by_id(id)
+                                            title= str(title)))
+            
             wx.PostEvent(current_pg,
                 Chi2UpdateEvent(output=self._cal_chisqr(data=data,
@@ -1255 +1256 @@
         self.parent.append_theory(data_id=data_id, 
                                           theory=new_plot, state=state)
-        ## plot
+        current_pg = self.fit_panel.get_page_by_id(id)
+        title = new_plot.title
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
-                                               title=new_plot.title))
+                                               title=title))
         # Chisqr in fitpage
-        current_pg = self.fit_panel.get_page_by_id(id)
         wx.PostEvent(current_pg,
             Chi2UpdateEvent(output=self._cal_chisqr(data=data, id=id, index=index)))