Changeset 1177

Timestamp:

Dec 19, 2013 1:34:54 PM (9 years ago)

Author:

vondreele

Message:

try to add more control over number format from ValidatedTxtCtrl?
not entirely successful so far

Location:

trunk

Files:

• GSASIIgrid.py (modified) (4 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)
• GSASIIpy3.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -175 +175 @@
       type of int, float, str or unicode; the TextCrtl will be initialized
       from this value.
+      
+    :param list [nDig,nPlc]: number of digits & places after decimal to use
+      for display of float (default=[10,2])
 
     :param bool notBlank: if True (default) blank values are invalid
@@ -223 +226 @@
 
     '''
-    def __init__(self,parent,loc,key,notBlank=True,min=None,max=None,
+    def __init__(self,parent,loc,key,nDig=[10,2],notBlank=True,min=None,max=None,
                  OKcontrol=None,OnLeave=None,typeHint=None,
                  CIFinput=False, **kw):
@@ -229 +232 @@
         self.result = loc
         self.key = key
+        self.nDig = nDig
         self.OKcontrol=OKcontrol
         self.OnLeave = OnLeave
@@ -314 +318 @@
                 else:
                     self.invalid = True
-            wx.TextCtrl.SetValue(self,str(G2py3.FormatValue(val)))
+            wx.TextCtrl.SetValue(self,str(G2py3.FormatValue(val,self.nDig)))
         else:
             wx.TextCtrl.SetValue(self,str(val))

trunk/GSASIIpwdGUI.py

@@ -1317 +1317 @@
     
     parms = []
-    parms.append(['Scale','Histogram scale factor: '])
-    parms.append(['Gonio. radius','Goniometer radius (mm): '])
+    parms.append(['Scale','Histogram scale factor: ',[10,4]])
+    parms.append(['Gonio. radius','Goniometer radius (mm): ',[10,3]])
     if data['Type'] == 'Debye-Scherrer':
-        parms += [['DisplaceX',u'Sample X displ. perp. to beam (\xb5m): '],
-            ['DisplaceY',u'Sample Y displ. || to beam (\xb5m): '],
-            ['Absorption',u'Sample absorption (\xb5\xb7r): '],]
+        parms += [['DisplaceX',u'Sample X displ. perp. to beam (\xb5m): ',[10,3]],
+            ['DisplaceY',u'Sample Y displ. || to beam (\xb5m): ',[10,3]],
+            ['Absorption',u'Sample absorption (\xb5\xb7r): ',[10,4]],]
     elif data['Type'] == 'Bragg-Brentano':
-        parms += [['Shift',u'Sample displacement(\xb5m): '],
-            ['Transparency',u'Sample transparency(1/\xb5eff, cm): '],
-            ['SurfRoughA','Surface roughness A: '],
-            ['SurfRoughB','Surface roughness B: '],]
-    parms.append(['Omega','Goniometer omega:',])
-    parms.append(['Chi','Goniometer chi:',])
-    parms.append(['Phi','Goniometer phi:',])
-    parms.append(['Temperature','Sample temperature (K): ',])
-    parms.append(['Pressure','Sample pressure (MPa): ',])
+        parms += [['Shift',u'Sample displacement(\xb5m): ',[10,4]],
+            ['Transparency',u'Sample transparency(1/\xb5eff, cm): ',[10,3]],
+            ['SurfRoughA','Surface roughness A: ',[10,4]],
+            ['SurfRoughB','Surface roughness B: ',[10,4]]]
+    parms.append(['Omega','Goniometer omega:',[10,3]])
+    parms.append(['Chi','Goniometer chi:',[10,3]])
+    parms.append(['Phi','Goniometer phi:',[10,3]])
+    parms.append(['Temperature','Sample temperature (K): ',[10,3]])
+    parms.append(['Pressure','Sample pressure (MPa): ',[10,3]])
                 
     mainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -1363 +1363 @@
 
     parmSizer = wx.FlexGridSizer(10,2,5,0)
-    for key,lbl in parms:
+    for key,lbl,nDig in parms:
         if 'list' in str(type(data[key])):
             parmRef = G2gd.G2CheckBox(G2frame.dataDisplay,' '+lbl,data[key],1)
             parmSizer.Add(parmRef,0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
-            parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data[key],0,typeHint=float)
+            parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data[key],0,nDig=nDig,typeHint=float)
         else:
             parmSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' '+lbl),

trunk/GSASIIpy3.py

@@ -39 +39 @@
     return val
 
-def FormatValue(val,maxdigits=10):
-    '''Format a float to fit in ``maxdigits`` spaces, showing as much
-    precision as possible, more or less.
+def FormatValue(val,maxdigits=[10,2]):
+    '''Format a float to fit in ``maxdigits[0]`` spaces with maxdigits[1] after decimal.
 
     :param float val: number to be formatted.
 
-    :param int maxdigits: the number of digits to be used for display of the
-      number (defaults to 10).
+    :param list maxdigits: the number of digits & places after decimal to be used for display of the
+      number (defaults to [10,2]).
 
     :returns: a string with <= maxdigits characters (I hope).  
@@ -52 +51 @@
     # does the standard str() conversion fit?
     string = str(val)
-    if len(string) <= maxdigits: return string.strip()
+    if len(string) <= maxdigits[0]: return string.strip()
     # negative numbers, leave room for a sign
-    if val < 0: maxdigits -= 1
-    decimals = maxdigits - 2
+    if val < 0: maxdigits[0] -= 1
+    decimals = maxdigits[0] - maxdigits[1]
     if abs(val) < 1e-99 or abs(val) > 1e99:
-        decimals = maxdigits - 6
-        fmt = "{" + (":{:d}.{:d}g".format(maxdigits,decimals))+"}" # create format string
+        decimals = min(maxdigits[0]-6,maxdigits[1])
+        fmt = "{" + (":{:d}.{:d}g".format(maxdigits[0],decimals))+"}" # create format string
     elif abs(val) < 1e-9 or abs(val) > 1e9:
-        decimals = maxdigits - 5
-        fmt = "{" + (":{:d}.{:d}g".format(maxdigits,decimals))+"}"
+        decimals = min(maxdigits[0]-5,maxdigits[1])
+        fmt = "{" + (":{:d}.{:d}g".format(maxdigits[0],decimals))+"}"
     elif abs(val) < 10**(4-decimals): # make sure at least 4 decimals show
-        decimals = maxdigits - 5
-        fmt = "{" + (":{:d}.{:d}g".format(maxdigits,decimals))+"}"
+        decimals = min(maxdigits[0]-5,maxdigits[1])
+        fmt = "{" + (":{:d}.{:d}g".format(maxdigits[0],decimals))+"}"
     elif abs(val) >= 10**decimals: # deal with large numbers in smaller spaces
-        decimals = maxdigits - 5
-        fmt = "{" + (":{:d}.{:d}g".format(maxdigits,decimals))+"}"
+        decimals = min(maxdigits[0]-5,maxdigits[1])
+        fmt = "{" + (":{:d}.{:d}g".format(maxdigits[0],decimals))+"}"
     elif abs(val) < 1: # use f format for small numbers
-        decimals = maxdigits - 2
-        fmt = "{" + (":{:d}.{:d}f".format(maxdigits,decimals))+"}"
+        decimals = min(maxdigits[0]-3,maxdigits[1])
+        fmt = "{" + (":{:d}.{:d}f".format(maxdigits[0],decimals))+"}"
     else: # in range where g formatting should do what I want
-        decimals = maxdigits - 1
-        fmt = "{" + (":{:d}.{:d}g".format(maxdigits,decimals))+"}"
+        decimals = maxdigits[0] - 1
+        fmt = "{" + (":{:d}.{:d}g".format(maxdigits[0],decimals))+"}"
+    print fmt,val
     return fmt.format(val).strip()