Changeset 3746

Timestamp:

Dec 1, 2018 1:25:05 PM (4 years ago)

Author:

vondreele

Message:

change LeBail? GUI to reflect state of the newLeBail flag.

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIddataGUI.py

@@ -835 +835 @@
             if not UseList[G2frame.hist]['LeBail']:
                 UseList[G2frame.hist]['newLeBail'] = True
+                Obj.SetLabel('Do new LeBail extraction?')
             UseList[G2frame.hist]['LeBail'] = Obj.GetValue()
 
@@ -892 +893 @@
         useBox.Add(useData,0,WACV)
         if not generalData['doPawley'] and 'PWDR' in G2frame.hist[:4]:
-            lebail = wx.CheckBox(DData,wx.ID_ANY,label='Do LeBail extraction?')
+            lbLabel = 'Redo LeBail extraction?   '
+            if UseList[G2frame.hist]['newLeBail']:
+                lbLabel = 'Do new LeBail extraction?'
+            lebail = wx.CheckBox(DData,wx.ID_ANY,label=lbLabel)
             lebail.Bind(wx.EVT_CHECKBOX, OnLeBail)
             lebail.SetValue(UseList[G2frame.hist]['LeBail'])

trunk/GSASIIpwdGUI.py

@@ -397 +397 @@
     '''
     histList = []
-    inst,inst2 = G2frame.GPXtree.GetItemPyData(
-        G2gd.GetGPXtreeItemId(
-            G2frame,G2frame.PatternId, 'Instrument Parameters')
-        )
+    inst,inst2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
     hType = inst['Type'][0]
     if 'Lam1' in inst:
@@ -408 +405 @@
     else:
         hLam = 0
-    sample = G2frame.GPXtree.GetItemPyData(
-        G2gd.GetGPXtreeItemId(
-            G2frame,G2frame.PatternId, 'Sample Parameters')
-        )
+    sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId,'Sample Parameters'))
     hGeom = sample.get('Type')
     hstName = G2frame.GPXtree.GetItemText(G2frame.PatternId)