Changeset 1a2dc10 in sasview

Timestamp:

Jan 21, 2010 5:21:12 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:

1702180

Parents:

91db958

Message:

add a way to delete a graph for invariant

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (2 diffs)
• invariant_panel.py (modified) (9 diffs)

sansview/perspectives/fitting/fitting.py

@@ -524 +524 @@
         self.parent._mgr.Update()
                
+  
     def _compute_invariant(self, event):    
         """
@@ -537 +538 @@
                 print "_compute_invariant" ,data._yunit
                 from invariant_panel import InvariantWindow
-                frame = InvariantWindow(base=self.parent, data=plottable)   
+                frame = InvariantWindow(base=self.parent, data=plottable, graph=self.panel.graph)   
                 frame.Show(True)
                 #from invariant_panel import InvariantDialog

sansview/perspectives/fitting/invariant_panel.py

@@ -49 +49 @@
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
-    def __init__(self, parent, data=None, base=None):
+    def __init__(self, parent, graph, data=None, base=None):
         wx.ScrolledWindow.__init__(self, parent, style= wx.FULL_REPAINT_ON_RESIZE )
         #Font size 
@@ -55 +55 @@
         #Object that receive status event
         self.parent = base
-      
+        self.graph = graph
         #Default power value
         self.power_law_exponant = 4 
@@ -83 +83 @@
                                       background=float(background),
                                        scale=float(scale))
-            
-            low_q = self.enable_low_cbox.GetValue() 
-            high_q = self.enable_high_cbox.GetValue()
             
             #Get the number of points to extrapolated
@@ -112 +109 @@
             #check the type of extrapolation
             extrapolation = None
+            low_q = self.enable_low_cbox.GetValue()
+            high_q = self.enable_high_cbox.GetValue()
             if low_q  and not high_q:
                 extrapolation = "low"
@@ -138 +137 @@
             #Compute qstar extrapolated to low q range
             #Clear the previous extrapolated plot
-            self._plot_data( name=self.data.name+" Extra_low_Q")
-            self._plot_data( name=self.data.name+" Extra_high_Q")
+       
             if low_q:
                 try: 
@@ -214 +212 @@
             return
         
-    def _plot_data(self, data=None, name="Unknown"):
+    def _plot_data(self, data, name="Unknown"):
         """
             Receive a data and post a NewPlotEvent to parent
@@ -220 +218 @@
             @param name: Data's name to use for the legend
         """
+        plottable = self.graph.get_plottable(name=name)
+        if plottable is not None:
+            self.graph.delete(plottable)
         # Create a plottable data
         new_plot = Data1D(x=[], y=[], dx=None, dy=None)
-        if data is not None:
-            new_plot.copy_from_datainfo(data) 
-            data.clone_without_data(clone=new_plot) 
+        new_plot.copy_from_datainfo(data) 
+        data.clone_without_data(clone=new_plot) 
             
         new_plot.name = name
@@ -241 +241 @@
             @param name: Data's name to use for the legend
         """
+        plottable = self.graph.get_plottable(name=name)
+        if plottable is not None:
+            self.graph.delete(plottable)
         # Create a plottable data
         new_plot = Theory1D(x=[], y=[], dy=None)
-        if data is not None:
-            new_plot.copy_from_datainfo(data) 
-            data.clone_without_data(clone=new_plot) 
+        new_plot.copy_from_datainfo(data) 
+        data.clone_without_data(clone=new_plot) 
             
         new_plot.name = name
@@ -637 +639 @@
     
 class InvariantDialog(wx.Dialog):
-    def __init__(self, parent=None, id=1,data=None, title="Invariant",base=None):
+    def __init__(self, parent=None, id=1,graph=None,
+                 data=None, title="Invariant",base=None):
         wx.Dialog.__init__(self, parent, id, title, size=( PANEL_WIDTH,
                                                              PANEL_HEIGHT))
-        self.panel = InvariantPanel(self, data=data, base=base)
+        self.panel = InvariantPanel(self,graph=graph, data=data, base=base)
         self.Centre()
         self.Show(True)
         
 class InvariantWindow(wx.Frame):
-    def __init__(self, parent=None, id=1,data=None, title="Invariant",base=None):
+    def __init__(self, parent=None, id=1,graph=None, 
+                 data=None, title="Invariant",base=None):
+        
         wx.Frame.__init__(self, parent, id, title, size=( PANEL_WIDTH,
                                                              PANEL_HEIGHT))
         
-        self.panel = InvariantPanel(self, data=data, base=base)
+        self.panel = InvariantPanel(self,graph=graph, data=data, base=base)
         self.Centre()
         self.Show(True)