Changeset 1524

Timestamp:

Oct 7, 2014 1:08:40 PM (9 years ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIgrid.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -1018 +1018 @@
         if 'PWDR' in Aname:
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample)
-            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Peak List'),[])
-            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Index Peak List'),[])
+            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Peak List'),{sigDict:{},peaks:[]})
+            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Index Peak List'),{sigDict:{},peaks:[]})
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Unit Cells List'),[])
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Reflection Lists'),{})

trunk/GSASIIgrid.py

@@ -212 +212 @@
         wx.TreeCtrl.Bind(self,eventtype,handler,*args,**kwargs)
 
-    def GetItemPyData(self,*args,**kwargs):
-        '''Override the standard method to wrap the contents
-        so that the source can be tracked
-        '''
-        data = super(self.__class__,self).GetItemPyData(*args,**kwargs)
-        textlist = self._getTreeItemsList(args[0])
-        if type(data) is dict:
-            return log.dictLogged(data,textlist)
-        if type(data) is list:
-            return log.listLogged(data,textlist)
-        if type(data) is tuple: #N.B. tuples get converted to lists
-            return log.listLogged(list(data),textlist)
-        return data
+#    def GetItemPyData(self,*args,**kwargs):
+#        '''Override the standard method to wrap the contents
+#        so that the source can be tracked
+#        '''
+#        data = super(self.__class__,self).GetItemPyData(*args,**kwargs)
+#        textlist = self._getTreeItemsList(args[0])
+#        if type(data) is dict:
+#            return log.dictLogged(data,textlist)
+#        if type(data) is list:
+#            return log.listLogged(data,textlist)
+#        if type(data) is tuple: #N.B. tuples get converted to lists
+#            return log.listLogged(list(data),textlist)
+#        return data
 
     def GetRelativeHistNum(self,histname):