Changeset 43bf807 in sasview

Timestamp:

Jun 6, 2008 11:14:47 AM (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:

0be5c81

Parents:

3dd29e3

Message:

Fixed labels in PlotPanel? and minor mod for sqrt units in unitConverter.

Location:

guitools

Files:

• PlotPanel.py (modified) (5 diffs)
• unitConverter.py (modified) (1 diff)

guitools/PlotPanel.py

@@ -27 +27 @@
     if 'get_children' in dir(obj):
         for a in obj.get_children(): show_tree(a,d+1)
-        
-def convertUnit(pow,unit):
+     
+from unitConverter import UnitConvertion as convertUnit   
+def _convertUnit(pow,unit):
     """ 
         Displays the unit with the proper convertion
@@ -48 +49 @@
     #print"this is unit",unit
     return unit
+
 def _rescale(lo,hi,step,pt=None,bal=None,scale='linear'):
         """
@@ -606 +608 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                units=convertUnit(-1,units)
+                units=convertUnit(-0.5,units)
                 self.graph.yaxis("1/\sqrt{%s}" %name,  "%s" % units)
                 
@@ -623 +625 @@
                 xname, xunits = item.get_xaxis() 
                 xunits = convertUnit(2,xunits) 
-                self.graph.yaxis("Log (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph.yaxis("Log (%s \ \ %s^{2})" % (yname,xname),  "%s%s" % (yunits,xunits))
                 
             
@@ -632 +634 @@
                 xname, xunits = item.get_xaxis()
                 xunits = convertUnit(4,xunits) 
-                self.graph.yaxis("Log (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph.yaxis("Log (%s \ \ %s^{4})" % (yname,xname),  "%s%s" % (yunits,xunits))
                 
             if ( self.viewModel == "Guinier lny vs x^(2)"):

guitools/unitConverter.py

@@ -41 +41 @@
                         if power==1.0:
                            unit = unitSplitted[0]
+                        elif power==0.5:
+                            unit = unitSplitted[0]+"^{1/2}"  
+                        elif power==-0.5:
+                            unit = unitSplitted[0]+"^{-1/2}"  
                         else:
                             unit= unitSplitted[0]+"^{"+str(power)+"}"