Changeset 3848 for trunk/GSASIIdataGUI.py

Timestamp:

Mar 9, 2019 2:58:21 PM (4 years ago)

Author:

vondreele

Message:

since id is a python routine which could be useful in debugging, replaced id with Id (or pid in one place)

File:

• trunk/GSASIIdataGUI.py (modified) (9 diffs)

trunk/GSASIIdataGUI.py

@@ -3164 +3164 @@
             ncols = len(data)/40+1
             dataGridSizer = wx.FlexGridSizer(cols=ncols,hgap=2,vgap=2)
-            for id,item in enumerate(self.data):
-                ckbox = wx.CheckBox(panel,id,item[1])
+            for Id,item in enumerate(self.data):
+                ckbox = wx.CheckBox(panel,Id,item[1])
                 ckbox.Bind(wx.EVT_CHECKBOX,self.OnCopyChange)                    
                 dataGridSizer.Add(ckbox,0,wx.LEFT,10)
@@ -3186 +3186 @@
         
         def OnCopyChange(self,event):
-            id = event.GetId()
-            self.data[id][0] = self.FindWindowById(id).GetValue()        
+            Id = event.GetId()
+            self.data[Id][0] = self.FindWindowById(Id).GetValue()        
             
         def OnOk(self,event):
@@ -3248 +3248 @@
             self.dataGridSizer.Add((-1,10))
             self.dataGridSizer.Add((-1,10))
-            for id,item in enumerate(self.selectData):
+            for Id,item in enumerate(self.selectData):
                 name = wx.TextCtrl(self.panel,-1,item,size=wx.Size(300,20))
                 name.SetEditable(False)
-                scale = G2G.ValidatedTxtCtrl(self.panel,self.selectVals,id,nDig=(10,3),typeHint=float)
+                scale = G2G.ValidatedTxtCtrl(self.panel,self.selectVals,Id,nDig=(10,3),typeHint=float)
                 self.dataGridSizer.Add(scale,0,wx.LEFT,10)
                 self.dataGridSizer.Add(name,0,wx.RIGHT,10)
@@ -3338 +3338 @@
                 dlg.Destroy()
                 return
-            for id,item in enumerate(self.selectData):
-                self.selectVals[id] = val
+            for Id,item in enumerate(self.selectData):
+                self.selectVals[Id] = val
             wx.CallAfter(self.Draw)
             
@@ -3352 +3352 @@
                 name = item
                 scale = self.selectVals[i]
-                id = self.data.index(name)
-                data = self.dataList[id]
+                Id = self.data.index(name)
+                data = self.dataList[Id]
                 if scale:
                     x,y,w,yc,yb,yd = data   #numpy arrays!
@@ -3705 +3705 @@
         fileList = []
         Source = ''
-        id, cookie = self.GPXtree.GetFirstChild(self.root)
-        while id:
-            name = self.GPXtree.GetItemText(id)
+        Id, cookie = self.GPXtree.GetFirstChild(self.root)
+        while Id:
+            name = self.GPXtree.GetItemText(Id)
             if fileType in name:
-                if id == skip:
+                if Id == skip:
                     Source = name
                 else:
-                    fileList.append([False,name,id])
-            id, cookie = self.GPXtree.GetNextChild(self.root, cookie)
+                    fileList.append([False,name,Id])
+            Id, cookie = self.GPXtree.GetNextChild(self.root, cookie)
         if skip:
             return fileList,Source
@@ -4175 +4175 @@
         Names = []
         if self.GPXtree.GetCount():
-            id, cookie = self.GPXtree.GetFirstChild(self.root)
-            while id:
-                name = self.GPXtree.GetItemText(id)
+            Id, cookie = self.GPXtree.GetFirstChild(self.root)
+            while Id:
+                name = self.GPXtree.GetItemText(Id)
                 Names.append(name)
                 if 'PWDR' in name:
                     TextList.append(name)
-                    Data = self.GPXtree.GetItemPyData(id)[1]
+                    Data = self.GPXtree.GetItemPyData(Id)[1]
                     pwdrMin = np.min(Data[1])
-                    Comments = self.GPXtree.GetItemPyData(GetGPXtreeItemId(self,id,'Comments'))
-                    Parms = self.GPXtree.GetItemPyData(GetGPXtreeItemId(self,id,'Instrument Parameters'))[0]
-                    fullLimits = self.GPXtree.GetItemPyData(GetGPXtreeItemId(self,id,'Limits'))[0]
+                    Comments = self.GPXtree.GetItemPyData(GetGPXtreeItemId(self,Id,'Comments'))
+                    Parms = self.GPXtree.GetItemPyData(GetGPXtreeItemId(self,Id,'Instrument Parameters'))[0]
+                    fullLimits = self.GPXtree.GetItemPyData(GetGPXtreeItemId(self,Id,'Limits'))[0]
                     if 'C' in Parms['Type'][0]:
                         wave = G2mth.getWave(Parms)
@@ -4933 +4933 @@
         self.ConstraintTab = wx.Menu(title='')
         self.ConstraintMenu.Append(menu=self.ConstraintTab, title='Select tab')
-        for id,txt in (
+        for Id,txt in (
                 (G2G.wxID_CONSPHASE,'Phase'),
                 (G2G.wxID_CONSHAP,'Histogram/Phase'),
@@ -4940 +4940 @@
                 (G2G.wxID_CONSSYM,'Sym-Generated'),
                 ):
-            self.ConstraintTab.Append(id,txt,'Select '+txt+' constraint editing tab')
+            self.ConstraintTab.Append(Id,txt,'Select '+txt+' constraint editing tab')
         self.ConstraintEdit = wx.Menu(title='')
         self.ConstraintMenu.Append(menu=self.ConstraintEdit, title='Edit Constr.') # renamed from Edit due to Mac adding extra items to menu