Changeset 1809 for trunk

Timestamp:

Apr 25, 2015 9:46:08 AM (10 years ago)

Author:

vondreele

Message:

fix crash in texture GUI
fix shift arrow problem at end of sequence

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASII.py ¶

@@ -2264 +2264 @@
                 if type(parent) is int: return # is this the toplevel in tree?
                 prev = self.PatternTree.GetPrevSibling(parent)
-                self.PatternTree.Collapse(parent)
-                self.PatternTree.Expand(prev)
                 NewId = G2gd.GetPatternTreeItemId(self,prev,name)
-                self.oldFocus = wx.Window.FindFocus()
-                wx.CallAfter(self.PatternTree.SelectItem,NewId)
+                if NewId:
+                    self.PatternTree.Collapse(parent)
+                    self.PatternTree.Expand(prev)
+                    self.oldFocus = wx.Window.FindFocus()
+                    wx.CallAfter(self.PatternTree.SelectItem,NewId)
+                else:
+                    wx.CallAfter(self.PatternTree.SelectItem,item)
             else:    
                 self.PatternTree.GetPrevSibling(item)
@@ -2275 +2278 @@
             if keyevt.GetModifiers() == wx.MOD_SHIFT and parent != self.root:
                 next = self.PatternTree.GetNextSibling(parent)
-                self.PatternTree.Collapse(parent)
-                self.PatternTree.Expand(next)
                 NewId = G2gd.GetPatternTreeItemId(self,next,name)
-                self.oldFocus = wx.Window.FindFocus()
-                wx.CallAfter(self.PatternTree.SelectItem,NewId)
+                if NewId:
+                    self.PatternTree.Collapse(parent)
+                    self.PatternTree.Expand(next)
+                    self.oldFocus = wx.Window.FindFocus()
+                    wx.CallAfter(self.PatternTree.SelectItem,NewId)
+                else:
+                    wx.CallAfter(self.PatternTree.SelectItem,item)
             else:    
                 self.PatternTree.GetNextSibling(item)

trunk/GSASIIphsGUI.py ¶

@@ -3586 +3586 @@
             Obj = event.GetEventObject()
             textureData['PlotType'] = Obj.GetValue()
-            UpdateTexture()
+            wx.CallLater(100,UpdateTexture)
             wx.CallAfter(G2plt.PlotTexture,G2frame,data)