Changeset 3875

Timestamp:

Apr 5, 2019 11:11:25 AM (4 years ago)

Author:

toby

Message:

fix error when background PWDR is deleted

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -226 +226 @@
         return textlist
     
-    def GetItemPyData(self,id):
+    def GetItemPyData(self,treeId):
         if 'phoenix' in wx.version():
-            return wx.TreeCtrl.GetItemData(self,id)
-        else:
-            return wx.TreeCtrl.GetItemPyData(self,id)
-
-    def SetItemPyData(self,id,data):
+            return wx.TreeCtrl.GetItemData(self,treeId)
+        else:
+            return wx.TreeCtrl.GetItemPyData(self,treeId)
+
+    def SetItemPyData(self,treeId,data):
         if 'phoenix' in wx.version():
-            return wx.TreeCtrl.SetItemData(self,id,data)
-        else:
-            return wx.TreeCtrl.SetItemPyData(self,id,data)
+            return wx.TreeCtrl.SetItemData(self,treeId,data)
+        else:
+            return wx.TreeCtrl.SetItemPyData(self,treeId,data)
 
     # def onSelectionChanged(self,event):
@@ -4497 +4497 @@
     displaying help information in a web browser.
     '''
-    def __init__(self, frame, id):
+    def __init__(self, frame, newId):
         self.frame = frame
-        wx.Panel.__init__(self, frame, id)
+        wx.Panel.__init__(self, frame, newId)
         sizer = wx.BoxSizer(wx.VERTICAL)
         back = wx.Button(self, -1, "Back")
         back.Bind(wx.EVT_BUTTON, self.OnBack)
-        self.htmlwin = G2HtmlWindow(self, id, size=(750,450))
+        self.htmlwin = G2HtmlWindow(self, newId, size=(750,450))
         sizer.Add(self.htmlwin, 1,wx.EXPAND)
         sizer.Add(back, 0, wx.ALIGN_LEFT, 0)

trunk/GSASIIpwdGUI.py

@@ -288 +288 @@
         backfile,mult = Pattern[0]['BackFile']
         if backfile:
-            bxye = mult*G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.root,backfile))[1][1]
+            bId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,backfile)
+            if bId:
+                bxye = mult*G2frame.GPXtree.GetItemPyData(bId)[1][1]
+            else:
+                print('Error: background PWDR {} not found'.format(backfile))
     return bxye