Changeset 3562fbc in sasview

Timestamp:

Feb 23, 2010 2:11:28 PM (15 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:

b324aa9

Parents:

4cf7443

Message:

remove togglescale method to use the one of plotpanel

Location:

guiframe

Files:

• dataFitting.py (modified) (4 diffs)
• local_perspectives/plotting/Plotter2D.py (modified) (1 diff)

guiframe/dataFitting.py

@@ -11 +11 @@
 import copy
 
-class Data1D(PlotData1D,LoadData1D):
+class Data1D(PlotData1D, LoadData1D):
     
     def __init__(self,x=[],y=[],dx=None,dy=None):
@@ -33 +33 @@
         self.xaxis(data1d._xaxis,data1d._xunit)
         self.yaxis(data1d._yaxis,data1d._yunit)
-    
+        
+    def __str__(self):
+        """
+            print data
+        """
+        _str = "%s\n" % LoadData1D.__str__(self)
+      
+        return _str 
 class Theory1D(PlotTheory1D,LoadData1D):
     
@@ -53 +60 @@
         self.xaxis(data1d._xaxis,data1d._xunit)
         self.yaxis(data1d._yaxis,data1d._yunit)
+    def __str__(self):
+        """
+            print data
+        """
+        _str = "%s\n" % LoadData1D.__str__(self)
+      
+        return _str 
       
 class Data2D(PlotData2D,LoadData2D):
@@ -79 +93 @@
         self.yaxis(data2d._yaxis,data2d._yunit)
         
+    def __str__(self):
+        """
+            print data
+        """
+        _str = "%s\n" % LoadData2D.__str__(self)
+      
+        return _str 
         
-        

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -516 +516 @@
             event = self._getEmptySlicerEvent()
             wx.PostEvent(self, event)
-          
-    
-    def _onToggleScale(self, event):
-        """
-            toggle scale and replot image
-        """
-        if self.scale == 'log':
-            self.scale = 'linear'
-        else:
-            self.scale = 'log'
-        self.image(self.data2D.data,self.xmin_2D,self.xmax_2D,self.ymin_2D,
-                   self.ymax_2D,self.zmin_2D ,self.zmax_2D )
-        
-        self.subplot.figure.canvas.draw_idle()
+