Changeset ab8f936 in sasview

Timestamp:

Dec 18, 2008 12:07:37 PM (16 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:

ef0c170

Parents:

6bcdad1

Message:

override a plot update —> model can be plotted with unik name

Location:

guiframe

Files:

• data_loader.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• local_perspectives/plotting/Plotter2D.py (modified) (2 diffs)
• local_perspectives/plotting/plotting.py (modified) (1 diff)

guiframe/data_loader.py

@@ -118 +118 @@
         new_plot.xaxis(output._xaxis,output._xunit)
         new_plot.yaxis(output._yaxis,output._yunit)
-        new_plot.group_id = filename
-        new_plot.id =None
+        new_plot.group_id = output.filename
+        new_plot.id = output.filename
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=filename))
     else:
@@ -146 +146 @@
             new_plot.xaxis(item._xaxis,item._xunit)
             new_plot.yaxis(item._yaxis,item._yunit)
-            new_plot.group_id = filename
+            new_plot.group_id = str(item.run[0])
+            new_plot.id = str(item.run[0])
+            
             wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=filename))
             i+=1

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -104 +104 @@
         
         is_new = True
-        #print "model panel name",event.plot.name
         if event.plot.name in self.plots.keys():
             # Check whether the class of plottable changed
-            #print "model panel",event.plot.name,event.plot.__class__
             if not event.plot.__class__==self.plots[event.plot.name].__class__:
+                #overwrite a plottable using the same name
                 self.graph.delete(self.plots[event.plot.name])
             else:
+                # plottable is already draw on the panel
                 is_new = False
-        
+
+           
         if is_new:
+            # a new plottable overwrites a plotted one  using the same id
+            for plottable in self.plots.itervalues():
+                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    

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -103 +103 @@
         """
         #TODO: Check for existence of plot attribute
+
         # Check whether this is a replot. If we ask for a replot
         # and the plottable no longer exists, ignore the event.
@@ -108 +109 @@
             and event.plot.name not in self.plots.keys():
             return
+        
         if hasattr(event, "reset"):
             self._reset()
+        print "model2 d event",event.plot.name, event.plot.id, event.plot.group_id
+        print "plottable list ",self.plots.keys()
+        print self.plots
         is_new = True
         if event.plot.name in self.plots.keys():
             # Check whether the class of plottable changed
             if not event.plot.__class__==self.plots[event.plot.name].__class__:
+                #overwrite a plottable using the same name
+                print "is deleting the new plottable"
                 self.graph.delete(self.plots[event.plot.name])
             else:
+                # plottable is already draw on the panel
                 is_new = False
-        self.plots[event.plot.name] = event.plot
-        #if is_new:
-        self.graph.add(self.plots[event.plot.name])
-        
-
+
+           
+        if is_new:
+            # a new plottable overwrites a plotted one  using the same id
+            print "went here",self.plots.itervalues()
+            for plottable in self.plots.itervalues():
+                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    
+ 
+        
         # Check axis labels
         #TODO: Should re-factor this
         #if event.plot._xunit != self.graph.prop["xunit"]:
-       
         self.graph.xaxis(event.plot._xaxis, event.plot._xunit)
+            
         #if event.plot._yunit != self.graph.prop["yunit"]:
         self.graph.yaxis(event.plot._yaxis, event.plot._yunit)
+      
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()

guiframe/local_perspectives/plotting/plotting.py

@@ -97 +97 @@
         # Check whether we already have a graph with the same units
         # as the plottable we just received. 
+        
         is_available = False
         for panel in self.plot_panels: