Changeset c6036f5 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 26, 2010 3:08:07 PM (15 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:

7609f1a

Parents:

509af3d

Message:

fix bug on fitpanel

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (2 diffs)
• fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -410 +410 @@
         fitproblem = None
         ## removing fit page
+        data = selected_page.get_data()
+        #Don' t remove plot for 2D
+        flag = True
+        if data.__class__.__name__ == 'Data2D':
+            flag = False
         if selected_page in page_finder:
             #Delete the name of the page into the list of open page
@@ -415 +420 @@
                 #Don't return any panel is the exact same page is created
                 name = str(list[0])
-                if selected_page.window_name == name:
+                if flag and selected_page.window_name == name:
                     if type.lower() in ['theory1d', 'theory2d']:
                         self.manager.remove_plot(selected_page, theory=True)

sansview/perspectives/fitting/fitting.py

@@ -698 +698 @@
                     wx.PostEvent(self.parent, NewPlotEvent(plot=item, title=str(title)))
                 else:
-                    item= copy.deepcopy(plottable )
-                    data= copy.deepcopy(plottable )
+                    item= copy.deepcopy(plottable)
+                    data= copy.deepcopy(plottable)
                     item.is_data=True
                     data.is_data=True
@@ -709 +709 @@
                 try:
                     page = self.fit_panel.add_fit_page(data)
-                    page.set_data(data)
                     # add data associated to the page created
-                    if page != None:   
+                    if page != None:  
+                        page.set_data(data) 
                         #create a fitproblem storing all link to data,model,page creation
                         if not page in self.page_finder.keys():