Changeset 509

Timestamp:

Mar 3, 2012 5:01:04 PM (12 years ago)

Author:

vondreele

Message:

shuffle data GUI for clarity

File:

• trunk/GSASIIphsGUI.py (modified) (4 diffs)

trunk/GSASIIphsGUI.py

@@ -2974 +2974 @@
                     isoSizer.Add(TopSizer(' Size model: ',['isotropic','uniaxial','ellipsoidal'],
                         'Size',OnSizeType),0,wx.ALIGN_CENTER_VERTICAL)
-                    isoSizer.Add(IsoSizer(u' Cryst. size(\xb5m): ','Size','%.3f',
-                        OnSizeVal,OnSizeRef),0,wx.ALIGN_CENTER_VERTICAL)
                     isoSizer.Add(LGmixSizer('Size',OnLGmixVal,OnLGmixRef))
                     mainSizer.Add(isoSizer)
+                    mainSizer.Add(IsoSizer(u' Cryst. size(\xb5m): ','Size','%.3f',
+                        OnSizeVal,OnSizeRef),0,wx.ALIGN_CENTER_VERTICAL)
                 elif UseList[item]['Size'][0] == 'uniaxial':
                     uniSizer = wx.BoxSizer(wx.HORIZONTAL)
                     uniSizer.Add(TopSizer(' Size model: ',['isotropic','uniaxial','ellipsoidal'],
                         'Size',OnSizeType),0,wx.ALIGN_CENTER_VERTICAL)
+                    uniSizer.Add(LGmixSizer('Size',OnLGmixVal,OnLGmixRef))
                     uniSizer.Add(UniSizer('Size',OnSizeAxis),0,wx.ALIGN_CENTER_VERTICAL)
-                    uniSizer.Add(LGmixSizer('Size',OnLGmixVal,OnLGmixRef))
                     mainSizer.Add(uniSizer)
                     mainSizer.Add(UniDataSizer(u'size(\xb5m): ','Size','%.3f',OnSizeVal,OnSizeRef))
@@ -2990 +2990 @@
                     ellSizer.Add(TopSizer(' Size model: ',['isotropic','uniaxial','ellipsoidal'],
                         'Size',OnSizeType),0,wx.ALIGN_CENTER_VERTICAL)
-                    ellSizer.Add(wx.StaticText(DData,-1,u' Coefficients(\xb5m): '),0,wx.ALIGN_CENTER_VERTICAL)
                     ellSizer.Add(LGmixSizer('Size',OnLGmixVal,OnLGmixRef))
                     mainSizer.Add(ellSizer)
@@ -3000 +2999 @@
                     isoSizer.Add(TopSizer(' Mustrain model: ',['isotropic','uniaxial','generalized',],
                         'Mustrain',OnStrainType),0,wx.ALIGN_CENTER_VERTICAL)
-                    isoSizer.Add(IsoSizer(' microstrain: ','Mustrain','%.1f',
-                        OnStrainVal,OnStrainRef),0,wx.ALIGN_CENTER_VERTICAL)                   
                     isoSizer.Add(LGmixSizer('Mustrain',OnLGmixVal,OnLGmixRef))
                     mainSizer.Add(isoSizer)
+                    mainSizer.Add(IsoSizer(' microstrain: ','Mustrain','%.1f',
+                        OnStrainVal,OnStrainRef),0,wx.ALIGN_CENTER_VERTICAL)                   
                     mainSizer.Add((0,5),0)
                 elif UseList[item]['Mustrain'][0] == 'uniaxial':
@@ -3009 +3008 @@
                     uniSizer.Add(TopSizer(' Mustrain model: ',['isotropic','uniaxial','generalized',],
                         'Mustrain',OnStrainType),0,wx.ALIGN_CENTER_VERTICAL)
+                    uniSizer.Add(LGmixSizer('Mustrain',OnLGmixVal,OnLGmixRef))
                     uniSizer.Add(UniSizer('Mustrain',OnStrainAxis),0,wx.ALIGN_CENTER_VERTICAL)
-                    uniSizer.Add(LGmixSizer('Mustrain',OnLGmixVal,OnLGmixRef))
                     mainSizer.Add(uniSizer)
                     mainSizer.Add(UniDataSizer('mustrain: ','Mustrain','%.1f',OnStrainVal,OnStrainRef))