Changeset fdb0f8b in sasview for guiframe

Timestamp:

Oct 16, 2008 5:15:01 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:

caa1226

Parents:

4ddf1067

Message:

fixing toggle lin\log

File:

• guiframe/local_perspectives/plotting/plotting.py (modified) (6 diffs)

guiframe/local_perspectives/plotting/plotting.py

@@ -361 +361 @@
         """
         #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.
@@ -367 +366 @@
             and event.plot.name not in self.plots.keys():
             return
-        
         if hasattr(event, "reset"):
             self._reset()
-        
         is_new = True
         if event.plot.name in self.plots.keys():
@@ -378 +375 @@
             else:
                 is_new = False
-        
-        if is_new:
-            self.plots[event.plot.name] = event.plot
-            self.graph.add(self.plots[event.plot.name])
-        else:
-            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    
- 
-        
+        self.plots[event.plot.name] = event.plot
+        #if is_new:
+        self.graph.add(self.plots[event.plot.name])
+        
+
         # 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()
@@ -414 +402 @@
                 
         # Option to save the data displayed
-        
-       
+    
         # Various plot options
         id = wx.NewId()
@@ -435 +422 @@
         
         slicerpop.AppendSeparator()
-       
-                
+      
         id = wx.NewId()
         slicerpop.Append(id, '&Toggle Linear/Log scale')
-        wx.EVT_MENU(self, id,  self._onToggleScale)    
+        wx.EVT_MENU(self, id, self._onToggleScale) 
 
         pos = event.GetPosition()
@@ -445 +431 @@
         self.PopupMenu(slicerpop, pos)
     
-    
-  
+    def _onToggleScale(self, event):
+        """
+            toggle axis and replot image
+        """
+        if self.scale == 'log':
+            self.scale = 'linear'
+        else:
+            self.scale = 'log'
+        self.image(self.data,self.xmin_2D,self.xmax_2D,self.ymin_2D,
+                   self.ymax_2D,self.zmin_2D ,self.zmax_2D )
+ 
       
 class Plugin: