Changeset 1909 for trunk/GSASII.py


Ignore:
Timestamp:
Jun 26, 2015 10:39:44 AM (7 years ago)
Author:
vondreele
Message:

fix import names for HKLF files - now explicit Shelx names
fix importing problems with run-on numbers in Shelx HKLF 4 & 5 files
fix issues with importing structure factors before importing a phase

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1907 r1909  
    777777                    self.PatternTree.SetItemPyData(Sub,copy.copy(rd.Parameters))
    778778                    self.PatternTree.SetItemPyData(
    779                         self.PatternTree.AppendItem(Id,text='Reflection List'),[])  #dummy entry for GUI use
     779                        self.PatternTree.AppendItem(Id,text='Reflection List'),{})  #dummy entry for GUI use
    780780                    newHistList.append(HistName)
    781781            else:
     
    790790                self.PatternTree.SetItemPyData(Sub,rd.Parameters)
    791791                self.PatternTree.SetItemPyData(
    792                     self.PatternTree.AppendItem(Id,text='Reflection List'),[])  #dummy entry for GUI use
     792                    self.PatternTree.AppendItem(Id,text='Reflection List'),{})  #dummy entry for GUI use
    793793                newHistList.append(HistName)
    794794               
     
    28292829                                        del(refList[item])
    28302830                            self.PatternTree.SetItemPyData(Id,refList)
     2831                        elif 'HKLF' in name:
     2832                            data = self.PatternTree.GetItemPyData(item)
     2833                            data[0] = {}
     2834                            self.PatternTree.SetItemPyData(item,data)
     2835                           
    28312836                        item, cookie = self.PatternTree.GetNextChild(self.root, cookie)
    28322837            finally:
Note: See TracChangeset for help on using the changeset viewer.