Changeset 4b91fd1 in sasview for guiframe/local_perspectives/plotting

Timestamp:

Jan 10, 2009 11:41:43 AM (16 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:

24ea33c

Parents:

9b05b2f

Message:

Fixed the updating problem for 2D model plots. Read comment for clean up refactoring suggestions.

File:

• guiframe/local_perspectives/plotting/Plotter2D.py (modified) (4 diffs)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -101 +101 @@
         """
             Data is ready to be displayed
+            
+            #TODO: this name should be changed to something more appropriate
+            # Don't forget that changing this name will mean changing code
+            # in plotting.py
+             
             @param event: data event
         """
@@ -113 +118 @@
         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():
@@ -121 +123 @@
             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
-
            
         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 :
@@ -138 +137 @@
             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    
+            # Update the plottable with the new data
+            
+            #TODO: we should have a method to do this, 
+            #      something along the lines of:
+            #      plottable1.update_data_from_plottable(plottable2)
+            
+            self.plots[event.plot.name].xmin = event.plot.xmin
+            self.plots[event.plot.name].xmax = event.plot.xmax
+            self.plots[event.plot.name].ymin = event.plot.ymin
+            self.plots[event.plot.name].ymax = event.plot.ymax
+            self.plots[event.plot.name].data = event.plot.data
+            self.plots[event.plot.name].err_data = event.plot.err_data
+