Changeset 1524


Ignore:
Timestamp:
Oct 7, 2014 1:08:40 PM (8 years ago)
Author:
vondreele
Message:

remove a stray print
fix peak list initialization - the other place

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r1507 r1524  
    10181018        if 'PWDR' in Aname:
    10191019            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample)
    1020             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Peak List'),[])
    1021             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Index Peak List'),[])
     1020            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Peak List'),{sigDict:{},peaks:[]})
     1021            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Index Peak List'),{sigDict:{},peaks:[]})
    10221022            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Unit Cells List'),[])
    10231023            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Reflection Lists'),{})
  • trunk/GSASIIgrid.py

    r1523 r1524  
    212212        wx.TreeCtrl.Bind(self,eventtype,handler,*args,**kwargs)
    213213
    214     def GetItemPyData(self,*args,**kwargs):
    215         '''Override the standard method to wrap the contents
    216         so that the source can be tracked
    217         '''
    218         data = super(self.__class__,self).GetItemPyData(*args,**kwargs)
    219         textlist = self._getTreeItemsList(args[0])
    220         if type(data) is dict:
    221             return log.dictLogged(data,textlist)
    222         if type(data) is list:
    223             return log.listLogged(data,textlist)
    224         if type(data) is tuple: #N.B. tuples get converted to lists
    225             return log.listLogged(list(data),textlist)
    226         return data
     214#    def GetItemPyData(self,*args,**kwargs):
     215#        '''Override the standard method to wrap the contents
     216#        so that the source can be tracked
     217#        '''
     218#        data = super(self.__class__,self).GetItemPyData(*args,**kwargs)
     219#        textlist = self._getTreeItemsList(args[0])
     220#        if type(data) is dict:
     221#            return log.dictLogged(data,textlist)
     222#        if type(data) is list:
     223#            return log.listLogged(data,textlist)
     224#        if type(data) is tuple: #N.B. tuples get converted to lists
     225#            return log.listLogged(list(data),textlist)
     226#        return data
    227227
    228228    def GetRelativeHistNum(self,histname):
Note: See TracChangeset for help on using the changeset viewer.