Changeset 3746


Ignore:
Timestamp:
Dec 1, 2018 1:25:05 PM (3 years ago)
Author:
vondreele
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIddataGUI.py

    r3610 r3746  
    835835            if not UseList[G2frame.hist]['LeBail']:
    836836                UseList[G2frame.hist]['newLeBail'] = True
     837                Obj.SetLabel('Do new LeBail extraction?')
    837838            UseList[G2frame.hist]['LeBail'] = Obj.GetValue()
    838839
     
    892893        useBox.Add(useData,0,WACV)
    893894        if not generalData['doPawley'] and 'PWDR' in G2frame.hist[:4]:
    894             lebail = wx.CheckBox(DData,wx.ID_ANY,label='Do LeBail extraction?')
     895            lbLabel = 'Redo LeBail extraction?   '
     896            if UseList[G2frame.hist]['newLeBail']:
     897                lbLabel = 'Do new LeBail extraction?'
     898            lebail = wx.CheckBox(DData,wx.ID_ANY,label=lbLabel)
    895899            lebail.Bind(wx.EVT_CHECKBOX, OnLeBail)
    896900            lebail.SetValue(UseList[G2frame.hist]['LeBail'])
  • trunk/GSASIIpwdGUI.py

    r3745 r3746  
    397397    '''
    398398    histList = []
    399     inst,inst2 = G2frame.GPXtree.GetItemPyData(
    400         G2gd.GetGPXtreeItemId(
    401             G2frame,G2frame.PatternId, 'Instrument Parameters')
    402         )
     399    inst,inst2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
    403400    hType = inst['Type'][0]
    404401    if 'Lam1' in inst:
     
    408405    else:
    409406        hLam = 0
    410     sample = G2frame.GPXtree.GetItemPyData(
    411         G2gd.GetGPXtreeItemId(
    412             G2frame,G2frame.PatternId, 'Sample Parameters')
    413         )
     407    sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId,'Sample Parameters'))
    414408    hGeom = sample.get('Type')
    415409    hstName = G2frame.GPXtree.GetItemText(G2frame.PatternId)
Note: See TracChangeset for help on using the changeset viewer.