Changeset 1807

Timestamp:

Apr 24, 2015 2:10:50 PM (8 years ago)

Author:

vondreele

Message:

remove some (now) dead code
fix shift-arrow for stepping thru tree
remove extra selections in tree processing

Location:

trunk

Files:

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

trunk/GSASII.py

@@ -2209 +2209 @@
         'Called when a tree item is expanded'
         self.OnPatternTreeSelChanged(event)
+        event.Skip()
         
     def OnPatternTreeItemDelete(self, event):
@@ -2265 +2266 @@
                 self.PatternTree.Collapse(parent)
                 self.PatternTree.Expand(prev)
-                id = G2gd.GetPatternTreeItemId(self,prev,name)
-                self.PatternTree.SelectItem(id)
+                NewId = G2gd.GetPatternTreeItemId(self,prev,name)
                 self.oldFocus = wx.Window.FindFocus()
+                wx.CallAfter(self.PatternTree.SelectItem,NewId)
             else:    
                 self.PatternTree.GetPrevSibling(item)
@@ -2277 +2278 @@
                 self.PatternTree.Collapse(parent)
                 self.PatternTree.Expand(next)
-                id = G2gd.GetPatternTreeItemId(self,next,name)
-                self.PatternTree.SelectItem(id)
+                NewId = G2gd.GetPatternTreeItemId(self,next,name)
                 self.oldFocus = wx.Window.FindFocus()
+                wx.CallAfter(self.PatternTree.SelectItem,NewId)
             else:    
                 self.PatternTree.GetNextSibling(item)

trunk/GSASIIctrls.py

@@ -75 +75 @@
         self.root = self.AddRoot('Loaded Data: ')
         self.SelectionChanged = None
+        self.textlist = None
         log.LogInfo['Tree'] = self
 
@@ -100 +101 @@
                     textlist[1] = self.GetRelativePhaseNum(textlist[1])
                 log.MakeTreeLog(textlist)
+            if textlist == self.textlist:
+                return      #same as last time - don't get it again
+            self.textlist = textlist
             self.SelectionChanged(event)
 

trunk/GSASIIgrid.py

@@ -205 +205 @@
         self.ShowModal()
         return
-        
-        
 
 class G2LoggedButton(wx.Button):
@@ -3718 +3716 @@
     '''Called from GSASII.OnPatternTreeSelChanged when a item is selected on the tree 
     '''
-    
-#    print G2frame.PatternTree.GetItemText(item)
+    pickName = G2frame.PatternTree.GetItemText(item)
+    if G2frame.PickId:
+        oldPick = G2frame.PatternTree.GetItemText(G2frame.PickId)
+        if oldPick == pickName:
+            return
     
     oldPage = None # will be set later if already on a Phase item

trunk/GSASIIphsGUI.py

@@ -3558 +3558 @@
             Obj = event.GetEventObject()
             G2frame.ContourColor = Obj.GetValue()
-            wx.CallAfter(G2plt.PlotTexture,G2frame,data)
-            
-        def OnPlaneSel(event):
-            Obj = event.GetEventObject()
-            textureData['PFproj'] = Obj.GetValue()
-            wx.CallAfter(G2plt.PlotTexture,G2frame,data)
-            
-        def OnRevPF(event):
-            Obj = event.GetEventObject()
-            textureData['PFrev'] = Obj.GetValue()
             wx.CallAfter(G2plt.PlotTexture,G2frame,data)