Changeset 1814

Timestamp:

Apr 27, 2015 5:11:13 PM (8 years ago)

Author:

toby

Message:

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

Location:

trunk

Files:

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

trunk/GSASII.py

@@ -2128 +2128 @@
         self.PatternId = 0
         self.PickId = 0
+        self.PickIdText = None
         self.PeakTable = []
         self.LimitsTable = []
@@ -2401 +2402 @@
                         self.PatternTree.SetItemPyData(Id,[Npix,imagefile])
                         self.PickId = Id
+                        self.PickIdText = self.PatternTree.GetItemText(self.PickId)
                         self.Image = Id
                 os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!                
@@ -2904 +2906 @@
                         self.PatternTree.Delete(item)
                     self.PickId = 0
+                    self.PickIdText = None
                     self.PatternId = 0
                     if nItems['PWDR']:

trunk/GSASIIIO.py

@@ -172 +172 @@
                 return os.path.join(pth,fil)
             pth,enddir = os.path.split(pth)
-        GSASIIpath.IPyBreak()
+        #GSASIIpath.IPyBreak()
 
     if not os.path.exists(imagefile):

trunk/GSASIIctrls.py

@@ -561 +561 @@
             # allow for above and sind, cosd, sqrt, tand, pi, and abbreviations
             # also addition, subtraction, division, multiplication, exponentiation
-            self.validchars = '0123456789.,-+eE/cosindcqrtap()*'
+            self.validchars = '0123456789.-+eE/cosindcqrtap()*'
         else:
             self.validchars = None

trunk/GSASIIgrid.py

@@ -3717 +3717 @@
     '''
     pickName = G2frame.PatternTree.GetItemText(item)
-    if G2frame.PickId:
-        oldPick = G2frame.PatternTree.GetItemText(G2frame.PickId)
-        if oldPick == pickName:
-            return
+    if G2frame.PickIdText == pickName:
+        return
     
     oldPage = None # will be set later if already on a Phase item
@@ -3753 +3751 @@
     G2frame.dataFrame.Raise()            
     G2frame.PickId = 0
+    G2frame.PickIdText = None
     parentID = G2frame.root
     #for i in G2frame.ExportPattern: i.Enable(False)
@@ -4015 +4014 @@
         data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
         G2pdG.UpdateReflectionGrid(G2frame,data,HKLF=True,Name=name)
+
+    if G2frame.PickId: 
+        G2frame.PickIdText = G2frame.PatternTree.GetItemText(G2frame.PickId)
     G2frame.dataFrame.Raise()