Changeset 2f189dc in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Mar 26, 2010 2:41:45 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:

509af3d

Parents:

da87bce

Message:

refactore fitpanel and removing the bug introduce while changing add fitpage use case

File:

• sansview/perspectives/fitting/fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/fitting.py

@@ -510 +510 @@
         else:
             time.sleep(0.4)
-   
-          
+            
+    def remove_plot(self, page, theory=False):
+        """
+            remove model plot when a fit page is closed
+        """
+        fitproblem = self.page_finder[page]
+        data = fitproblem.get_fit_data()
+        model = fitproblem.get_model()
+        if model is not None:
+            name = model.name
+            new_plot = Theory1D(x=[], y=[], dy=None)
+            new_plot.name = name
+            new_plot.xaxis(data._xaxis, data._xunit)
+            new_plot.yaxis(data._yaxis, data._yunit)
+            new_plot.group_id = data.group_id
+            new_plot.id = data.id + name
+            wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=data.name))
+        if theory:
+            new_plot_data = Data1D(x=[], y=[], dx=None, dy=None)
+            new_plot_data.name = data.name
+            new_plot_data.xaxis(data._xaxis, data._xunit)
+            new_plot_data.yaxis(data._yaxis, data._yunit)
+            new_plot_data.group_id = data.group_id
+            new_plot_data.id = data.id 
+            wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot_data,
+                                                    title=data.name))
+        
     def _onEVT_SLICER_PANEL(self, event):
         """
@@ -531 +556 @@
             from the plot
         """    
-        self.fit_panel._close_fitpage(event.data) 
+        self.fit_panel.close_page_with_data(event.data) 
         
     def _add_page_onmenu(self, name,fitproblem=None):
@@ -626 +651 @@
         for plottable in self.panel.graph.plottables:
             if plottable.name == self.panel.graph.selected_plottable:
-                #if not hasattr(plottable, "is_data"):
-                    
                 if  plottable.__class__.__name__=="Theory1D":
                     dy=numpy.zeros(len(plottable.y))
@@ -633 +656 @@
                         dy= copy.deepcopy(plottable.dy)
                         
-                    item= self.copy_data(plottable, dy)
+                    item = self.copy_data(plottable, dy)
                     item.group_id += "data1D"
                     item.id +="data1D"
-                    item.is_data= False
+                    item.is_data = False
                     title = item.name
-                    wx.PostEvent(self.parent, NewPlotEvent(plot=item, title=str(title)))
+                    title = 'Data created from Theory'
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=item,
+                                                            title=str(title),
+                                                           reset=True))
                 else:
                     item= self.copy_data(plottable, plottable.dy)  
@@ -698 +724 @@
                         wx.PostEvent(self.parent, StatusEvent(status="Page was already Created"))
                 except:
-                    wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
-                    %sys.exc_value))
+                    raise
+                    #wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
+                    #%sys.exc_value))
                     return