Changeset f5fda87 in sasview

Timestamp:

Mar 5, 2010 7:04:33 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

2e94cbde

Parents:

53b6b74

Message:

guiframe: ensure that the legend (and the whole plottable) is removed from the graph when an empty plottable is sent in a plotting event

File:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -106 +106 @@
             self._reset()
         
+        # Check whether the plottable is empty
+        is_empty = len(event.plot.x)==0
+                
         is_new = True
         if event.plot.name in self.plots.keys():
+            # If the plottable is empty, just remove the plottable from the graph
+            if is_empty:
+                self.graph.delete(self.plots[event.plot.name])
+                
             # Check whether the class of plottable changed
             if not event.plot.__class__==self.plots[event.plot.name].__class__:
@@ -116 +123 @@
                 is_new = False
         
-        if is_new:
-            # a new plottable overwrites a plotted one  using the same id
-            for plottable in self.plots.itervalues():
-                if hasattr(event.plot,"id") and hasattr(plottable, "id"):
-                    if event.plot.id==plottable.id :
-                        self.graph.delete(plottable)
-            
-            self.plots[event.plot.name] = event.plot
-            self.graph.add(self.plots[event.plot.name])
-        else:
-            #replot the graph
-            self.plots[event.plot.name].x = event.plot.x    
-            self.plots[event.plot.name].y = event.plot.y    
-            self.plots[event.plot.name].dy = event.plot.dy  
-            if hasattr(event.plot, 'dx') and hasattr(self.plots[event.plot.name], 'dx'):
-                self.plots[event.plot.name].dx = event.plot.dx    
+        if not is_empty:
+            if is_new:
+                # a new plottable overwrites a plotted one  using the same id
+                for plottable in self.plots.itervalues():
+                    if hasattr(event.plot,"id") and hasattr(plottable, "id"):
+                        if event.plot.id==plottable.id :
+                            self.graph.delete(plottable)
+                
+                self.plots[event.plot.name] = event.plot
+                self.graph.add(self.plots[event.plot.name])
+            else:
+                #replot the graph
+                self.plots[event.plot.name].x = event.plot.x    
+                self.plots[event.plot.name].y = event.plot.y    
+                self.plots[event.plot.name].dy = event.plot.dy  
+                if hasattr(event.plot, 'dx') and hasattr(self.plots[event.plot.name], 'dx'):
+                    self.plots[event.plot.name].dx = event.plot.dx    
           
         #TODO: Should re-factor this