Changeset 1807


Ignore:
Timestamp:
Apr 24, 2015 2:10:50 PM (7 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1806 r1807  
    22092209        'Called when a tree item is expanded'
    22102210        self.OnPatternTreeSelChanged(event)
     2211        event.Skip()
    22112212       
    22122213    def OnPatternTreeItemDelete(self, event):
     
    22652266                self.PatternTree.Collapse(parent)
    22662267                self.PatternTree.Expand(prev)
    2267                 id = G2gd.GetPatternTreeItemId(self,prev,name)
    2268                 self.PatternTree.SelectItem(id)
     2268                NewId = G2gd.GetPatternTreeItemId(self,prev,name)
    22692269                self.oldFocus = wx.Window.FindFocus()
     2270                wx.CallAfter(self.PatternTree.SelectItem,NewId)
    22702271            else:   
    22712272                self.PatternTree.GetPrevSibling(item)
     
    22772278                self.PatternTree.Collapse(parent)
    22782279                self.PatternTree.Expand(next)
    2279                 id = G2gd.GetPatternTreeItemId(self,next,name)
    2280                 self.PatternTree.SelectItem(id)
     2280                NewId = G2gd.GetPatternTreeItemId(self,next,name)
    22812281                self.oldFocus = wx.Window.FindFocus()
     2282                wx.CallAfter(self.PatternTree.SelectItem,NewId)
    22822283            else:   
    22832284                self.PatternTree.GetNextSibling(item)
  • trunk/GSASIIctrls.py

    r1803 r1807  
    7575        self.root = self.AddRoot('Loaded Data: ')
    7676        self.SelectionChanged = None
     77        self.textlist = None
    7778        log.LogInfo['Tree'] = self
    7879
     
    100101                    textlist[1] = self.GetRelativePhaseNum(textlist[1])
    101102                log.MakeTreeLog(textlist)
     103            if textlist == self.textlist:
     104                return      #same as last time - don't get it again
     105            self.textlist = textlist
    102106            self.SelectionChanged(event)
    103107
  • trunk/GSASIIgrid.py

    r1788 r1807  
    205205        self.ShowModal()
    206206        return
    207        
    208        
    209207
    210208class G2LoggedButton(wx.Button):
     
    37183716    '''Called from GSASII.OnPatternTreeSelChanged when a item is selected on the tree
    37193717    '''
    3720    
    3721 #    print G2frame.PatternTree.GetItemText(item)
     3718    pickName = G2frame.PatternTree.GetItemText(item)
     3719    if G2frame.PickId:
     3720        oldPick = G2frame.PatternTree.GetItemText(G2frame.PickId)
     3721        if oldPick == pickName:
     3722            return
    37223723   
    37233724    oldPage = None # will be set later if already on a Phase item
  • trunk/GSASIIphsGUI.py

    r1806 r1807  
    35583558            Obj = event.GetEventObject()
    35593559            G2frame.ContourColor = Obj.GetValue()
    3560             wx.CallAfter(G2plt.PlotTexture,G2frame,data)
    3561            
    3562         def OnPlaneSel(event):
    3563             Obj = event.GetEventObject()
    3564             textureData['PFproj'] = Obj.GetValue()
    3565             wx.CallAfter(G2plt.PlotTexture,G2frame,data)
    3566            
    3567         def OnRevPF(event):
    3568             Obj = event.GetEventObject()
    3569             textureData['PFrev'] = Obj.GetValue()
    35703560            wx.CallAfter(G2plt.PlotTexture,G2frame,data)
    35713561           
Note: See TracChangeset for help on using the changeset viewer.