Changeset 1814


Ignore:
Timestamp:
Apr 27, 2015 5:11:13 PM (7 years ago)
Author:
toby
Message:

save selected tree text name at time of selection (see G2frame.PickId?)

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1812 r1814  
    21282128        self.PatternId = 0
    21292129        self.PickId = 0
     2130        self.PickIdText = None
    21302131        self.PeakTable = []
    21312132        self.LimitsTable = []
     
    24012402                        self.PatternTree.SetItemPyData(Id,[Npix,imagefile])
    24022403                        self.PickId = Id
     2404                        self.PickIdText = self.PatternTree.GetItemText(self.PickId)
    24032405                        self.Image = Id
    24042406                os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!               
     
    29042906                        self.PatternTree.Delete(item)
    29052907                    self.PickId = 0
     2908                    self.PickIdText = None
    29062909                    self.PatternId = 0
    29072910                    if nItems['PWDR']:
  • trunk/GSASIIIO.py

    r1778 r1814  
    172172                return os.path.join(pth,fil)
    173173            pth,enddir = os.path.split(pth)
    174         GSASIIpath.IPyBreak()
     174        #GSASIIpath.IPyBreak()
    175175
    176176    if not os.path.exists(imagefile):
  • trunk/GSASIIctrls.py

    r1811 r1814  
    561561            # allow for above and sind, cosd, sqrt, tand, pi, and abbreviations
    562562            # also addition, subtraction, division, multiplication, exponentiation
    563             self.validchars = '0123456789.,-+eE/cosindcqrtap()*'
     563            self.validchars = '0123456789.-+eE/cosindcqrtap()*'
    564564        else:
    565565            self.validchars = None
  • trunk/GSASIIgrid.py

    r1807 r1814  
    37173717    '''
    37183718    pickName = G2frame.PatternTree.GetItemText(item)
    3719     if G2frame.PickId:
    3720         oldPick = G2frame.PatternTree.GetItemText(G2frame.PickId)
    3721         if oldPick == pickName:
    3722             return
     3719    if G2frame.PickIdText == pickName:
     3720        return
    37233721   
    37243722    oldPage = None # will be set later if already on a Phase item
     
    37533751    G2frame.dataFrame.Raise()           
    37543752    G2frame.PickId = 0
     3753    G2frame.PickIdText = None
    37553754    parentID = G2frame.root
    37563755    #for i in G2frame.ExportPattern: i.Enable(False)
     
    40154014        data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
    40164015        G2pdG.UpdateReflectionGrid(G2frame,data,HKLF=True,Name=name)
     4016
     4017    if G2frame.PickId:
     4018        G2frame.PickIdText = G2frame.PatternTree.GetItemText(G2frame.PickId)
    40174019    G2frame.dataFrame.Raise()
    40184020
Note: See TracChangeset for help on using the changeset viewer.