Changeset b6972a0f in sasview

Timestamp:

May 29, 2008 2:41:04 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:

ab6098f

Parents:

05da1f89

Message:

some improvement in the way to display units

File:

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

guitools/PlotPanel.py

@@ -20 +20 @@
 from plottables import Graph
 #(FuncFitEvent, EVT_FUNC_FIT) = wx.lib.newevent.NewEvent()
-import math,pylab
+import math,pylab,re
+
 def show_tree(obj,d=0):
     """Handy function for displaying a tree of graph objects"""
@@ -26 +27 @@
     if 'get_children' in dir(obj):
         for a in obj.get_children(): show_tree(a,d+1)
+        
+def convertUnit(pow,unit):
+    """ 
+        Displays the unit with the proper convertion
+        @param pow: the user set the power of the unit
+        @param unit: the unit of the data
+    """ 
+    toks=re.match("^", unit)
+    if not toks==None:
+        unitValue= re.split("{",unit)
+        unitPower= re.split("}",unitValue[1])
+        power= int(unitPower[0])*pow
+        word= unitValue[0]+"{"+str(power)+"}"
+        if power==1:
+            tempUnit=re.split("\^",unitValue[0])
+            unit=tempUnit[0]
+        else:
+            unit = word
+    #print"this is unit",unit
+    return unit
 def _rescale(lo,hi,step,pt=None,bal=None,scale='linear'):
         """
@@ -487 +508 @@
                 self.set_xscale("linear")
                 name, units = item.get_xaxis()
-                self.graph.xaxis("%s" % name,  "%s^{-1}" % units)
+                self.graph.xaxis("%s" % name,  "%s" % units)
+                
                 
             if ( self.xLabel=="x^(2)" ):
@@ -493 +515 @@
                 self.set_xscale('linear')
                 name, units = item.get_xaxis()
-                self.graph.xaxis("%s^{2}" % name,  "%s^{-2}" % units)
+                units=convertUnit(2,units) 
+                self.graph.xaxis("%s^{2}" % name,  "%s" % units)
+                
                 
             if (self.xLabel=="log10(x)" ):
@@ -499 +523 @@
                 self.set_xscale("log")
                 name, units = item.get_xaxis() 
-                self.graph.xaxis("\log_{10}\ \  (%s)" % name,  "%s^{-1}" % units)
+                self.graph.xaxis("\log_{10}\ \  (%s)" % name,  "%s" % units)
+                
                 
             if ( self.yLabel=="ln(y)" ):
@@ -505 +530 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("log\ \ %s" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("log\ \ %s" % name,  "%s" % units)
+                
                 
             if ( self.yLabel=="y" ):
@@ -511 +537 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("%s" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("%s" % name,  "%s" % units)
+               
                 
             if ( self.yLabel=="log10(y)" ): 
@@ -517 +544 @@
                 self.set_yscale("log")  
                 name, units = item.get_yaxis()
-                self.graph.yaxis("\log_{10}\ \ (%s)" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("\log_{10}\ \ (%s)" % name,  "%s" % units)
+                
                 
             if ( self.yLabel=="y^(2)" ):
@@ -523 +551 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("%s^{2}" % name,  "%s^{-2}" % units)
+                units=convertUnit(2,units) 
+                self.graph.yaxis("%s^{2}" % name,  "%s" % units)
+                
                 
             if ( self.yLabel =="1/y"):
@@ -529 +559 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("1/%s" % name,  "\ \%s" % units)
+                units=convertUnit(-1,units)
+                self.graph.yaxis("1/%s" % name,  "%s" % units)
                 
             if ( self.yLabel =="1/sqrt(y)" ):
@@ -535 +566 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
+                units=convertUnit(-1,units)
                 self.graph.yaxis("1/\sqrt{%s}" %name,  "%s" % units)
                 
@@ -542 +574 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis()
-                self.graph.yaxis("log\ (%s \ \ %s)" % (yname,xname),  "%s^{-1}%s^{-1}" % (yunits,xunits))
+                self.graph.yaxis("log\ (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
+               
                 
             if ( self.yLabel =="ln(y*x^(2))"):
@@ -549 +582 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis() 
-                self.graph.yaxis("Log (%s \ \ %s^{2})" % (yname,xname),  "%s^{-1}%s^{-2}" % (yunits,xunits))
+                xunits = convertUnit(2,xunits) 
+                self.graph.yaxis("Log (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
+                
             
             if ( self.yLabel =="ln(y*x^(4))"):
@@ -556 +591 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis()
-                self.graph.yaxis("Log (%s \ \ %s^{4})" % (yname,xname),  "%s^{-1}%s^{-4}" % (yunits,xunits))
-            
+                xunits = convertUnit(4,xunits) 
+                self.graph.yaxis("Log (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
+                
             if ( self.viewModel == "Guinier lny vs x^(2)"):
                 
@@ -563 +599 @@
                 self.set_xscale('linear')
                 name, units = item.get_xaxis()
-                self.graph.xaxis("%s^{2}" % name,  "%s^{-2}" % units)
+                units = convertUnit(2,units) 
+                self.graph.xaxis("%s^{2}" % name,  "%s" % units)
+                
                 
                 item.transformY(transform.toLogX,transform.errToLogX )
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("$Log %s$" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("$Log %s$" % name,  "%s" % units)
+               
                 
             item.transformView()
             
-        #item.name = self.yLabel+" vs " +self.xLabel  
+         
         self.resetFitView()   
         self.prevXtrans = self.xLabel 
@@ -579 +618 @@
         self.subplot.figure.canvas.draw_idle()
         
+        
+    
     def onFitDisplay(self, tempx,tempy,xminView,xmaxView,xmin,xmax,func):
         """