Changeset 35891ce in sasview for guitools

Timestamp:

Apr 21, 2008 11:29:05 AM (17 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:

46693050

Parents:

8e44d51

Message:

changed labels

File:

• guitools/PlotPanel.py (modified) (9 diffs)

guitools/PlotPanel.py

@@ -346 +346 @@
                 self.set_xscale("log")
                 name, units = item.get_xaxis()
-                self.graph.xaxis("%s" % name,  "%s^{-1}" % units)
+                self.graph.xaxis("Log10 %s" % name,  "%s^{-1}" % units)
                 
             if ( self.yscales=="ln(y)" ):
@@ -352 +352 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("%s" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("log %s" % name,  "%s^{-1}" % units)
                 
             if ( self.yscales=="y" ):
@@ -364 +364 @@
                 self.set_yscale("log")  
                 name, units = item.get_yaxis()
-                self.graph.yaxis("%s" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("Log10 %s" % name,  "%s^{-1}" % units)
                 
             if ( self.yscales=="y^(2)" ):
@@ -371 +371 @@
                 name, units = item.get_yaxis()
                 self.graph.yaxis("%s^2" % name,  "%s^{-2}" % units)
+                
             if ( self.yscales =="1/y"):
                 item.transform_y( transform.toOneOverX , transform.errOneOverX )
@@ -376 +377 @@
                 name, units = item.get_yaxis()
                 self.graph.yaxis("%s" % name,  "%s" % units)
+                
             if ( self.yscales =="1/sqrt(y)" ):
                 item.transform_y( transform.toOneOverSqrtX ,transform.errOneOverSqrtX )
@@ -387 +389 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis()
-                self.graph.yaxis("%s%s" % (yname,xname),  "%s^{-1}%s^{-1}" % (yunits,xunits))
+                self.graph.yaxis("Log %s%s" % (yname,xname),  "%s^{-1}%s^{-1}" % (yunits,xunits))
                 
             if ( self.yscales =="ln(y*x^(2))"):
@@ -394 +396 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis()
-                self.graph.yaxis("%s%s^{2}" % (yname,xname),  "%s^{-1}%s^{-2}" % (yunits,xunits))
+                self.graph.yaxis("Log %s%s^{2}" % (yname,xname),  "%s^{-1}%s^{-2}" % (yunits,xunits))
             
             if ( self.yscales =="ln(y*x^(4))"):
@@ -401 +403 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis()
-                self.graph.yaxis("%s%s^{4}" % (yname,xname),  "%s^{-1}%s^{-4}" % (yunits,xunits))
+                self.graph.yaxis("Log %s%s^{4}" % (yname,xname),  "%s^{-1}%s^{-4}" % (yunits,xunits))
             
             if ( self.viewModel == "Guinier lny vs x^(2)"):
@@ -413 +415 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("%s" % name,  "%s^{-1}" % units)
-                 
+                self.graph.yaxis("Log %s" % name,  "%s^{-1}" % units)
+        #item.name = self.yscales+" vs " +self.xscales      
         self.prevXtrans = self.xscales 
         self.prevYtrans = self.yscales