Changeset 1834 for trunk/GSASIIddataGUI.py

Timestamp:

May 4, 2015 9:10:23 AM (10 years ago)

Author:

vondreele

Message:

redefine azimuthal angle in Sample Parms as the center of the azimuthal bin; the azimuthat angle in Instrument parms is defined as the mean angle for polarization (only 0-90 & slightly different)
some cosmetic changes to GUI displays
fix imports/G2pwd_fxye.py to handle multi time-maps found in HIPPO data & the slightly screwy one in HIPD data

File:

• trunk/GSASIIddataGUI.py (modified) (11 diffs)

trunk/GSASIIddataGUI.py ¶

@@ -145 +145 @@
         scaleRef.SetValue(UseList[G2frame.hist]['Scale'][1])
         scaleRef.Bind(wx.EVT_CHECKBOX, OnScaleRef)
-        scaleSizer.Add(scaleRef,0,WACV)
+        scaleSizer.Add(scaleRef,0,WACV|wx.LEFT,5)
         scaleVal = wx.TextCtrl(DData,wx.ID_ANY,
             '%.4f'%(UseList[G2frame.hist]['Scale'][0]),style=wx.TE_PROCESS_ENTER)
@@ -470 +470 @@
         Indx[lgmixRef.GetId()] = [G2frame.hist,name]
         lgmixRef.Bind(wx.EVT_CHECKBOX, OnRef)
-        lgmixSizer.Add(lgmixRef,0,WACV)
+        lgmixSizer.Add(lgmixRef,0,WACV|wx.LEFT,5)
         lgmixVal = wx.TextCtrl(DData,wx.ID_ANY,
             '%.4f'%(UseList[G2frame.hist][name][1][2]),style=wx.TE_PROCESS_ENTER)
@@ -476 +476 @@
         lgmixVal.Bind(wx.EVT_TEXT_ENTER,OnVal)
         lgmixVal.Bind(wx.EVT_KILL_FOCUS,OnVal)
-        lgmixSizer.Add(lgmixVal,0,WACV)
+        lgmixSizer.Add(lgmixVal,0,WACV|wx.LEFT,5)
         return lgmixSizer
                     
@@ -486 +486 @@
         Indx[reset.GetId()] = [G2frame.hist,name]
         reset.Bind(wx.EVT_CHECKBOX,OnReset)
-        resetSizer.Add(reset,0,WACV|wx.TOP,5)
+        resetSizer.Add(reset,0,WACV|wx.TOP|wx.LEFT,5)
         return resetSizer
         
@@ -496 +496 @@
         Indx[sizeRef.GetId()] = [G2frame.hist,0]
         sizeRef.Bind(wx.EVT_CHECKBOX, OnRef)
-        isoSizer.Add(sizeRef,0,WACV)
+        isoSizer.Add(sizeRef,0,WACV|wx.LEFT,5)
         sizeVal = wx.TextCtrl(DData,wx.ID_ANY,
             fmt%(UseList[G2frame.hist][parm][1][0]),style=wx.TE_PROCESS_ENTER)
@@ -583 +583 @@
             Indx[hstrainRef.GetId()] = [G2frame.hist,id]
             hstrainRef.Bind(wx.EVT_CHECKBOX, OnHstrainRef)
-            hstrainSizer.Add(hstrainRef,0,WACV)
+            hstrainSizer.Add(hstrainRef,0,WACV|wx.LEFT,5)
             hstrainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.3g'%(val),style=wx.TE_PROCESS_ENTER)
             Indx[hstrainVal.GetId()] = [G2frame.hist,id]
@@ -654 +654 @@
             ODFval.Bind(wx.EVT_TEXT_ENTER,OnODFValue)
             ODFval.Bind(wx.EVT_KILL_FOCUS,OnODFValue)
-            ODFSizer.Add(ODFval,0,WACV)
+            ODFSizer.Add(ODFval,0,WACV|wx.LEFT,5)
         return ODFSizer
         
@@ -702 +702 @@
         extRef.SetValue(UseList[G2frame.hist]['Extinction'][1])
         extRef.Bind(wx.EVT_CHECKBOX, OnExtRef)
-        extSizer.Add(extRef,0,WACV)
+        extSizer.Add(extRef,0,WACV|wx.LEFT,5)
         extVal = wx.TextCtrl(DData,wx.ID_ANY,
             '%.2f'%(UseList[G2frame.hist]['Extinction'][0]),style=wx.TE_PROCESS_ENTER)
@@ -760 +760 @@
                 Indx[Eref.GetId()] = [G2frame.hist,ekey]
                 Eref.Bind(wx.EVT_CHECKBOX, OnEref)
-                val2Sizer.Add(Eref,0,WACV)
+                val2Sizer.Add(Eref,0,WACV|wx.LEFT,5)
                 Eval = wx.TextCtrl(DData,wx.ID_ANY,
                     '%10.3e'%(UseList[G2frame.hist]['Extinction'][2][ekey][0]),style=wx.TE_PROCESS_ENTER)
@@ -778 +778 @@
             Indx[babRef.GetId()] = [G2frame.hist,bab]
             babRef.Bind(wx.EVT_CHECKBOX, OnBabRef)
-            babSizer.Add(babRef,0,WACV)
+            babSizer.Add(babRef,0,WACV|wx.LEFT,5)
             babVal = wx.TextCtrl(DData,wx.ID_ANY,
                 '%.3f'%(UseList[G2frame.hist]['Babinet']['Bab'+bab][0]),style=wx.TE_PROCESS_ENTER)
@@ -821 +821 @@
         useData.Bind(wx.EVT_CHECKBOX, OnUseData)
         useData.SetValue(UseList[G2frame.hist]['Use'])
-        bottomSizer.Add(showSizer,0,WACV|wx.TOP|wx.BOTTOM,5)
+        bottomSizer.Add(showSizer,0,WACV|wx.TOP|wx.BOTTOM|wx.LEFT,5)
         
         bottomSizer.Add(ScaleSizer(),0,WACV|wx.BOTTOM,5)