Changeset 1964


Ignore:
Timestamp:
Aug 28, 2015 9:25:44 AM (6 years ago)
Author:
vondreele
Message:

fix bug in atomadd for SS structures
make sure ComboBoxes? are READONLY
fix IndexPeaks? error - pointer got changed to float (via np.array?); now force to int.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIindex.py

    r1637 r1964  
    330330            hkl = HKL[pos]                                 # put in hkl
    331331            if hkl[-1] >= 0:                                 # peak already assigned - test if this one better
    332                 opeak = peaks[hkl[-1]]
     332                opeak = peaks[int(hkl[-1])]                 #hkl[-1] needs to be int here
    333333                dold = abs(opeak[-2]-hkl[3])
    334334                dnew = min(dm,dp)
  • trunk/GSASIIphsGUI.py

    r1963 r1964  
    857857                Map['RefList'] = [Map['RefList'],]
    858858            lineSizer.Add(wx.ComboBox(General,value=Map['RefList'][0],choices=Map['RefList'],
    859                 style=wx.CB_DROPDOWN),0,WACV)
     859                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
    860860            refList = wx.Button(General,label='Select reflection sets')
    861861            refList.Bind(wx.EVT_BUTTON,OnRefList)
     
    932932                Flip['RefList'] = [Flip['RefList'],]
    933933            lineSizer.Add(wx.ComboBox(General,value=Flip['RefList'][0],choices=Flip['RefList'],
    934                 style=wx.CB_DROPDOWN),0,WACV)
     934                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
    935935            refList = wx.Button(General,label='Select reflection sets')
    936936            refList.Bind(wx.EVT_BUTTON,OnRefList)
     
    16141614            atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,'I',0.01,0,0,0,0,0,0,atId])
    16151615        elif generalData['Type'] in ['modulated','magnetic']:
    1616             atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,0,'I',0.01,0,0,0,0,0,0,atId,[],[],SSdefault])
     1616            atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,'I',0.01,0,0,0,0,0,0,atId,[],[],SSdefault])
    16171617        SetupGeneral()
    16181618        if 'Atoms' in data['Drawing']:           
     
    24942494                Map['RefList'] = [Map['RefList'],]
    24952495            mapSizer.Add(wx.ComboBox(waveData,value=Map['RefList'][0],choices=Map['RefList'],
    2496                 style=wx.CB_DROPDOWN),0,WACV)
     2496                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
    24972497            refList = wx.Button(waveData,label='Select reflection sets')
    24982498            refList.Bind(wx.EVT_BUTTON,OnRefList)
     
    38913891            shPenalty.Add(wx.StaticText(Texture,wx.ID_ANY,' Negative MRD penalty list: '),0,WACV)
    38923892            shPenalty.Add(wx.ComboBox(Texture,value=Penalty[0][0],choices=Penalty[0],
    3893                 style=wx.CB_DROPDOWN),0,WACV)
     3893                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
    38943894            hklList = wx.Button(Texture,label='Select penalty hkls')
    38953895            hklList.Bind(wx.EVT_BUTTON,OnHKLList)
Note: See TracChangeset for help on using the changeset viewer.