Changeset d6d411d in sasview

Timestamp:

Jul 21, 2008 2:05:25 PM (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:

6aaf444

Parents:

be72312c

Message:

Bug fix

Location:

guitools

Files:

• PlotPanel.py (modified) (13 diffs)
• plottables.py (modified) (1 diff)

guitools/PlotPanel.py

@@ -746 +746 @@
         
         for item in list:
-            print item.name
+            print item.name, self.xLabel, item.get_xaxis()
             item.setLabel(self.xLabel,self.yLabel)
             if ( self.xLabel=="x" ):
                 item.transformX(transform.toX,transform.errToX)
                 name, units = item.get_xaxis()
-                self.graph.xaxis("%s" % name,  "%s" % units)
+                self.graph._xaxis_transformed("%s" % name,  "%s" % units)
                 
                 
@@ -758 +758 @@
                 name, units = item.get_xaxis()
                 units=convertUnit(2,units) 
-                self.graph.xaxis("%s^{2}" % name,  "%s" % units)
+                self.graph._xaxis_transformed("%s^{2}" % name,  "%s" % units)
                 
                 
@@ -765 +765 @@
                 _xscale = 'log'
                 name, units = item.get_xaxis() 
-                self.graph.xaxis("\log_{10}\ \  (%s)" % name,  "%s" % units)
+                self.graph._xaxis_transformed("\log_{10}\ \  (%s)" % name,  "%s" % units)
                 
                 
@@ -771 +771 @@
                 item.transformY(transform.toLogX,transform.errToLogX)
                 name, units = item.get_yaxis()
-                self.graph.yaxis("\log\ \ %s" % name,  "%s" % units)
+                self.graph._yaxis_transformed("\log\ \ %s" % name,  "%s" % units)
                 
                 
@@ -777 +777 @@
                 item.transformY(transform.toX,transform.errToX)
                 name, units = item.get_yaxis()
-                self.graph.yaxis("%s" % name,  "%s" % units)
+                self.graph._yaxis_transformed("%s" % name,  "%s" % units)
                
                 
@@ -784 +784 @@
                 _yscale = 'log'  
                 name, units = item.get_yaxis()
-                self.graph.yaxis("\log_{10}\ \ (%s)" % name,  "%s" % units)
+                self.graph._yaxis_transformed("\log_{10}\ \ (%s)" % name,  "%s" % units)
                 
                 
@@ -791 +791 @@
                 name, units = item.get_yaxis()
                 units=convertUnit(2,units) 
-                self.graph.yaxis("%s^{2}" % name,  "%s" % units)
+                self.graph._yaxis_transformed("%s^{2}" % name,  "%s" % units)
                 
                 
@@ -798 +798 @@
                 name, units = item.get_yaxis()
                 units=convertUnit(-1,units)
-                self.graph.yaxis("1/%s" % name,  "%s" % units)
+                self.graph._yaxis_transformed("1/%s" % name,  "%s" % units)
                 
             if ( self.yLabel =="1/sqrt(y)" ):
@@ -804 +804 @@
                 name, units = item.get_yaxis()
                 units=convertUnit(-0.5,units)
-                self.graph.yaxis("1/\sqrt{%s}" %name,  "%s" % units)
+                self.graph._yaxis_transformed("1/\sqrt{%s}" %name,  "%s" % units)
                 
             if ( self.yLabel =="ln(y*x)"):
@@ -810 +810 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis()
-                self.graph.yaxis("\log\ (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph._yaxis_transformed("\log\ (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
                
                 
@@ -818 +818 @@
                 xname, xunits = item.get_xaxis() 
                 xunits = convertUnit(2,xunits) 
-                self.graph.yaxis("\log (%s \ \ %s^{2})" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph._yaxis_transformed("\log (%s \ \ %s^{2})" % (yname,xname),  "%s%s" % (yunits,xunits))
                 
             
@@ -826 +826 @@
                 xname, xunits = item.get_xaxis()
                 xunits = convertUnit(4,xunits) 
-                self.graph.yaxis("\log (%s \ \ %s^{4})" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph._yaxis_transformed("\log (%s \ \ %s^{4})" % (yname,xname),  "%s%s" % (yunits,xunits))
                 
             if ( self.viewModel == "Guinier lny vs x^(2)"):
@@ -833 +833 @@
                 name, units = item.get_xaxis()
                 units = convertUnit(2,units) 
-                self.graph.xaxis("%s^{2}" % name,  "%s" % units)
+                self.graph._xaxis_transformed("%s^{2}" % name,  "%s" % units)
                 
                 
                 item.transformY(transform.toLogX,transform.errToLogX )
                 name, units = item.get_yaxis()
-                self.graph.yaxis("\log\ \ %s" % name,  "%s" % units)
+                self.graph._yaxis_transformed("\log\ \ %s" % name,  "%s" % units)
                
                 

guitools/plottables.py

@@ -116 +116 @@
     would be nice.
     """
+    def _xaxis_transformed(self, name, units):
+        """
+            Change the property of the x axis
+            according to an axis transformation
+            (as opposed to changing the basic properties)
+        """
+        self.prop["xlabel"] = "%s (%s)"%(name,units)
+        self.prop["xunit"] = units
+        
+    def _yaxis_transformed(self, name, units):
+        """
+            Change the property of the y axis
+            according to an axis transformation
+            (as opposed to changing the basic properties)
+        """
+        self.prop["ylabel"] = "%s (%s)"%(name,units)
+        self.prop["yunit"] = units
+        
     def xaxis(self,name,units):
         """Properties of the x axis.
         """
-        if self.prop["xunit"] and units != self.prop["xunit"]:
-            pass
-            #print "Plottable: how do we handle non-commensurate units"
         self.prop["xlabel"] = "%s (%s)"%(name,units)
         self.prop["xunit"] = units
+        self.prop["xlabel_base"] = "%s (%s)"%(name,units)
+        self.prop["xunit_base"] = units
 
     def yaxis(self,name,units):
         """Properties of the y axis.
         """
-        if self.prop["yunit"] and units != self.prop["yunit"]:
-            pass
-            #print "Plottable: how do we handle non-commensurate units"
         self.prop["ylabel"] = "%s (%s)"%(name,units)
         self.prop["yunit"] = units
+        self.prop["ylabel_base"] = "%s (%s)"%(name,units)
+        self.prop["yunit_base"] = units
         
     def title(self,name):