Changeset 1964

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:

• GSASIIindex.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (5 diffs)

trunk/GSASIIindex.py

@@ -330 +330 @@
             hkl = HKL[pos]                                 # put in hkl
             if hkl[-1] >= 0:                                 # peak already assigned - test if this one better
-                opeak = peaks[hkl[-1]]
+                opeak = peaks[int(hkl[-1])]                 #hkl[-1] needs to be int here
                 dold = abs(opeak[-2]-hkl[3])
                 dnew = min(dm,dp)

trunk/GSASIIphsGUI.py

@@ -857 +857 @@
                 Map['RefList'] = [Map['RefList'],]
             lineSizer.Add(wx.ComboBox(General,value=Map['RefList'][0],choices=Map['RefList'],
-                style=wx.CB_DROPDOWN),0,WACV)
+                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
             refList = wx.Button(General,label='Select reflection sets')
             refList.Bind(wx.EVT_BUTTON,OnRefList)
@@ -932 +932 @@
                 Flip['RefList'] = [Flip['RefList'],]
             lineSizer.Add(wx.ComboBox(General,value=Flip['RefList'][0],choices=Flip['RefList'],
-                style=wx.CB_DROPDOWN),0,WACV)
+                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
             refList = wx.Button(General,label='Select reflection sets')
             refList.Bind(wx.EVT_BUTTON,OnRefList)
@@ -1614 +1614 @@
             atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,'I',0.01,0,0,0,0,0,0,atId])
         elif generalData['Type'] in ['modulated','magnetic']:
-            atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,0,'I',0.01,0,0,0,0,0,0,atId,[],[],SSdefault])
+            atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,'I',0.01,0,0,0,0,0,0,atId,[],[],SSdefault])
         SetupGeneral()
         if 'Atoms' in data['Drawing']:            
@@ -2494 +2494 @@
                 Map['RefList'] = [Map['RefList'],]
             mapSizer.Add(wx.ComboBox(waveData,value=Map['RefList'][0],choices=Map['RefList'],
-                style=wx.CB_DROPDOWN),0,WACV)
+                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
             refList = wx.Button(waveData,label='Select reflection sets')
             refList.Bind(wx.EVT_BUTTON,OnRefList)
@@ -3891 +3891 @@
             shPenalty.Add(wx.StaticText(Texture,wx.ID_ANY,' Negative MRD penalty list: '),0,WACV)
             shPenalty.Add(wx.ComboBox(Texture,value=Penalty[0][0],choices=Penalty[0],
-                style=wx.CB_DROPDOWN),0,WACV)
+                style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
             hklList = wx.Button(Texture,label='Select penalty hkls')
             hklList.Bind(wx.EVT_BUTTON,OnHKLList)