Changeset 3848 for trunk/GSASIIddataGUI.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/GSASIIddataGUI.py (modified) (4 diffs)

trunk/GSASIIddataGUI.py

@@ -391 +391 @@
         parms = zip([' Equatorial '+parmName,' Axial '+parmName],
             UseList[G2frame.hist][parm][1],UseList[G2frame.hist][parm][2],range(2))
-        for Pa,val,ref,id in parms:
+        for Pa,val,ref,Id in parms:
             sizeRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             sizeRef.thisown = False
             sizeRef.SetValue(ref)
-            Indx[sizeRef.GetId()] = [G2frame.hist,id]
+            Indx[sizeRef.GetId()] = [G2frame.hist,Id]
             sizeRef.Bind(wx.EVT_CHECKBOX, OnRef)
             dataSizer.Add(sizeRef,0,WACV|wx.LEFT,5)
 #        azmthOff = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'azmthOff',nDig=(10,2),typeHint=float,OnLeave=OnAzmthOff)
             sizeVal = wx.TextCtrl(DData,wx.ID_ANY,fmt%(val),style=wx.TE_PROCESS_ENTER)
-            Indx[sizeVal.GetId()] = [G2frame.hist,id]
+            Indx[sizeVal.GetId()] = [G2frame.hist,Id]
             sizeVal.Bind(wx.EVT_TEXT_ENTER,OnVal)
             sizeVal.Bind(wx.EVT_KILL_FOCUS,OnVal)
@@ -410 +410 @@
             UseList[G2frame.hist]['Size'][5],range(6))
         dataSizer = wx.FlexGridSizer(0,6,5,5)
-        for Pa,val,ref,id in parms:
+        for Pa,val,ref,Id in parms:
             sizeRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             sizeRef.thisown = False
             sizeRef.SetValue(ref)
-            Indx[sizeRef.GetId()] = [G2frame.hist,id]
+            Indx[sizeRef.GetId()] = [G2frame.hist,Id]
             sizeRef.Bind(wx.EVT_CHECKBOX, OnSizeRef)
             dataSizer.Add(sizeRef,0,WACV)
 #        azmthOff = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'azmthOff',nDig=(10,2),typeHint=float,OnLeave=OnAzmthOff)
             sizeVal = wx.TextCtrl(DData,wx.ID_ANY,'%.3f'%(val),style=wx.TE_PROCESS_ENTER)
-            Indx[sizeVal.GetId()] = [G2frame.hist,id]
+            Indx[sizeVal.GetId()] = [G2frame.hist,Id]
             sizeVal.Bind(wx.EVT_TEXT_ENTER,OnSizeVal)
             sizeVal.Bind(wx.EVT_KILL_FOCUS,OnSizeVal)
@@ -434 +434 @@
         parms = zip(Snames,UseList[G2frame.hist]['Mustrain'][4],UseList[G2frame.hist]['Mustrain'][5],range(numb))
         dataSizer = wx.FlexGridSizer(0,6,5,5)
-        for Pa,val,ref,id in parms:
+        for Pa,val,ref,Id in parms:
             strainRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             strainRef.thisown = False
             strainRef.SetValue(ref)
-            Indx[strainRef.GetId()] = [G2frame.hist,id]
+            Indx[strainRef.GetId()] = [G2frame.hist,Id]
             strainRef.Bind(wx.EVT_CHECKBOX, OnStrainRef)
             dataSizer.Add(strainRef,0,WACV)
 #        azmthOff = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'azmthOff',nDig=(10,2),typeHint=float,OnLeave=OnAzmthOff)
             strainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.1f'%(val),style=wx.TE_PROCESS_ENTER)
-            Indx[strainVal.GetId()] = [G2frame.hist,id]
+            Indx[strainVal.GetId()] = [G2frame.hist,Id]
             strainVal.Bind(wx.EVT_TEXT_ENTER,OnStrainVal)
             strainVal.Bind(wx.EVT_KILL_FOCUS,OnStrainVal)
@@ -454 +454 @@
         Hsnames = G2spc.HStrainNames(SGData)
         parms = zip(Hsnames,UseList[G2frame.hist]['HStrain'][0],UseList[G2frame.hist]['HStrain'][1],range(len(Hsnames)))
-        for Pa,val,ref,id in parms:
+        for Pa,val,ref,Id in parms:
             hstrainRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             hstrainRef.thisown = False
             hstrainRef.SetValue(ref)
-            Indx[hstrainRef.GetId()] = [G2frame.hist,id]
+            Indx[hstrainRef.GetId()] = [G2frame.hist,Id]
             hstrainRef.Bind(wx.EVT_CHECKBOX, OnHstrainRef)
             hstrainSizer.Add(hstrainRef,0,WACV|wx.LEFT,5)
 #        azmthOff = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'azmthOff',nDig=(10,2),typeHint=float,OnLeave=OnAzmthOff)
             hstrainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.3g'%(val),style=wx.TE_PROCESS_ENTER)
-            Indx[hstrainVal.GetId()] = [G2frame.hist,id]
+            Indx[hstrainVal.GetId()] = [G2frame.hist,Id]
             hstrainVal.Bind(wx.EVT_TEXT_ENTER,OnHstrainVal)
             hstrainVal.Bind(wx.EVT_KILL_FOCUS,OnHstrainVal)