Changeset 2495 for trunk/GSASIIddataGUI.py

Timestamp:

Oct 18, 2016 3:58:13 PM (9 years ago)

Author:

vondreele

Message:

some cleanup of Data tab
fix (!) crash after Refine for Costraints & Rigid Bodies - DELETED windows problem
remove Babinet & Flack from magnetic structures
remove magnetic from StructureFactorDeriv2
make new StructureFactorDerivMag? & work in that

File:

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

trunk/GSASIIddataGUI.py ¶

@@ -419 +419 @@
         Axis.Bind(wx.EVT_TEXT_ENTER,OnAxis)
         Axis.Bind(wx.EVT_KILL_FOCUS,OnAxis)
-        uniSizer.Add(Axis,0,WACV)
+        uniSizer.Add(Axis,0,WACV|wx.LEFT,5)
         return uniSizer
         
@@ -432 +432 @@
             Indx[sizeRef.GetId()] = [G2frame.hist,id]
             sizeRef.Bind(wx.EVT_CHECKBOX, OnRef)
-            dataSizer.Add(sizeRef,0,WACV)
+            dataSizer.Add(sizeRef,0,WACV|wx.LEFT,5)
             sizeVal = wx.TextCtrl(DData,wx.ID_ANY,fmt%(val),style=wx.TE_PROCESS_ENTER)
             Indx[sizeVal.GetId()] = [G2frame.hist,id]
@@ -524 +524 @@
         poRef.SetValue(POData[2])
         poRef.Bind(wx.EVT_CHECKBOX,OnPORef)
-        poSizer.Add(poRef,0,WACV)
+        poSizer.Add(poRef,0,WACV|wx.LEFT,5)
         poVal = wx.TextCtrl(DData,wx.ID_ANY,
             '%.3f'%(POData[1]),style=wx.TE_PROCESS_ENTER)
@@ -595 +595 @@
         shPenalty.Add(wx.StaticText(DData,wx.ID_ANY,' Negative MRD penalty list: '),0,WACV)
         shPenalty.Add(wx.ComboBox(DData,value=POData[6][0],choices=POData[6],
-            style=wx.CB_DROPDOWN),0,WACV)
+            style=wx.CB_DROPDOWN),0,WACV|wx.LEFT,5)
         hklList = wx.Button(DData,label='Select penalty hkls')
         hklList.Bind(wx.EVT_BUTTON,OnHKLList)
@@ -668 +668 @@
             Obj.SetValue("%.2f"%(UseList[G2frame.hist]['Extinction'][0]))
 
-        extSizer = wx.BoxSizer(wx.VERTICAL)
         if Type == 'HKLF':
+            extSizer = wx.BoxSizer(wx.VERTICAL)
             typeSizer = wx.BoxSizer(wx.HORIZONTAL)            
             typeSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Extinction type: '),0,WACV)
@@ -727 +727 @@
                 extSizer.Add(val2Sizer,0,WACV)
         else:   #PWDR
+            extSizer = wx.BoxSizer(wx.HORIZONTAL)
             extRef = wx.CheckBox(DData,wx.ID_ANY,label=' Extinction: ')
             extRef.SetValue(UseList[G2frame.hist]['Extinction'][1])
@@ -876 +877 @@
         addtwin = wx.CheckBox(DData,wx.ID_ANY,label=' Add Twin Law')
         addtwin.Bind(wx.EVT_CHECKBOX, OnAddTwin)
-        topsizer.Add(addtwin,0,WACV)
+        topsizer.Add(addtwin,0,WACV|wx.LEFT,5)
         twinsizer.Add(topsizer)
         Indx = {}
@@ -890 +891 @@
                     TwVal = Twin[1][0]
                 if 'bool' not in str(type(Twin[0])):
-                    matSizer.Add(wx.StaticText(DData,-1,' Twin Law: '),0,WACV)
+                    matSizer.Add(wx.StaticText(DData,-1,' Twin Law: '),0,WACV|wx.LEFT,5)
                     for im,Mat in enumerate(twinMat):
                         mat = wx.TextCtrl(DData,wx.ID_ANY,'%3d %3d %3d'%(Mat[0],Mat[1],Mat[2]),
@@ -902 +903 @@
                         matSizer.Add(mat,0,WACV|wx.LEFT,5)
                 else:
-                    matSizer.Add(wx.StaticText(DData,-1,' Nonmerohedral twin component %d: '%(it)),0,WACV)
+                    matSizer.Add(wx.StaticText(DData,-1,' Nonmerohedral twin component %d: '%(it)),0,WACV|wx.LEFT,5)
                     if not SGData['SGInv']:
                         twinv = wx.CheckBox(DData,wx.ID_ANY,label=' Use enantiomorph?')
@@ -1087 +1088 @@
             bottomSizer.Add(poSizer,0,WACV|wx.TOP|wx.BOTTOM,5)
             bottomSizer.Add(ExtSizer('PWDR'),0,WACV|wx.TOP|wx.BOTTOM,5)
-            bottomSizer.Add(BabSizer(),0,WACV|wx.BOTTOM,5)
+            if generalData['Type'] != 'magnetic': 
+                bottomSizer.Add(BabSizer(),0,WACV|wx.BOTTOM,5)
         elif G2frame.hist[:4] == 'HKLF':
 #patch
@@ -1109 +1111 @@
             useList.append(name)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
-    mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,WACV)
+    mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,WACV|wx.LEFT,5)
     if G2frame.hist != '':
         topSizer = wx.FlexGridSizer(1,2,5,5)