Changeset fd51a7c in sasview

Timestamp:

Oct 12, 2011 4:04:01 PM (13 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:

26fc866

Parents:

da6fd1a

Message:

make sure residuals ans data are plotted using the same graph for each batch page

Location:

sansguiframe/src/sans/guiframe

Files:

• data_processor.py (modified) (5 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (3 diffs)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -91 +91 @@
         self.AdjustScrollbars()
         #self.SetLabelBackgroundColour('#DBD4D4')
+        self.uid = wx.NewId()
         self.parent = parent
         self.panel = panel
@@ -614 +615 @@
         self.plot_button = None
         self.notebook = None
+        self.list_plot_panels = {}
         self.layout_grid()
         self.layout_plotting_area()
@@ -678 +680 @@
         grid = self.notebook.GetPage(pos)
         title = self.notebook.GetPageText(pos)
-        
-        
-        group_id = wx.NewId()
+    
         for cell in grid.selected_cells:
             row, col = cell
@@ -697 +697 @@
                                  StatusEvent(status=msg, info="error")) 
                             return
+                        
                         if issubclass(new_plot.__class__, Data1D):
-                            new_plot.group_id = group_id
-                            new_plot.list_group_id .append(group_id)
+                            if label in self.list_plot_panels.keys():
+                                group_id = self.list_plot_panels[label]
+                            else:
+                                group_id = str(grid.uid) + str(new_plot.group_id)
+                                self.list_plot_panels[label] = group_id
+                            if group_id not in new_plot.list_group_id:
+                                new_plot.group_id = group_id
+                                new_plot.list_group_id.append(group_id)
                         else:
                             if label.lower() in ["data", "chi2"]:
@@ -710 +717 @@
                                     return  
                         wx.PostEvent(self.parent.parent, 
+                                     NewPlotEvent(action="clear",
+                                                  group_id=str(group_id),
+                                                  title=title))  
+                        wx.PostEvent(self.parent.parent, 
                                      NewPlotEvent(plot=new_plot, 
-                                  group_id=str(new_plot.group_id),
-                                   title =title))  
+                                                  group_id=str(group_id),
+                                                  title=title))  
                 else:
                    

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -164 +164 @@
         self.plots      = {}
         if self.is_zoomed:
-                self.is_zoomed = False
+            self.is_zoomed = False
         
     def _OnReSize(self, event):   
@@ -279 +279 @@
             if self.is_zoomed:
                 self.is_zoomed = False
-        
+      
           
     def draw_plot(self):
@@ -287 +287 @@
         self.draw()  
 
-
-       
     def onLeftDown(self,event): 
         """ 

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -125 +125 @@
         if group_id in self.plot_panels.keys():
             panel = self.plot_panels[group_id]
+            for plottable in panel.graph.plottables.keys():
+                self.remove_plot(group_id, plottable.id)
             panel.graph.reset()
             return True
         return False
             
-        
     def hide_panel(self, group_id):
         """
@@ -275 +276 @@
             if group_id in self.plot_panels.keys():
                 #remove data from panel
-                if event.action.lower() == 'remove':
+                if event.action.lower().strip() == 'remove':
                     id = event.id
                     return self.remove_plot(group_id, id)
-                if event.action.lower() == 'hide':
+                if event.action.lower().strip() == 'hide':
                     return self.hide_panel(group_id)
-                if event.action.lower() == 'delete':
+                if event.action.lower().strip() == 'delete':
                     panel = self.plot_panels[group_id]
                     uid = panel.uid
                     return self.parent.delete_panel(uid)
-                if event.action.lower() == "clear":
+                if event.action.lower().strip() == "clear":
                     return self.clear_panel_by_id(group_id)
         if not hasattr(event, 'plot'):