Changeset 2021

Timestamp:

Oct 20, 2015 10:17:12 PM (7 years ago)

Author:

toby

Message:

prevent reread of previously-read files by reading through all IMG tree items

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• autoint.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -3031 +3031 @@
        
 def GetPatternTreeDataNames(G2frame,dataTypes):
-    '''Needs a doc string
+    '''Finds all items in tree that match a 4 character prefix
+    
+    :param wx.Frame G2frame: Data tree frame object
+    :param list dataTypes: Contains one or more data tree item types to be matched
+      such as ['IMG '] or ['PWDR','HKLF']
+    :returns: a list of tree item names for the matching items  
     '''
     names = []

trunk/autoint.py

@@ -71 +71 @@
         if self.params['Mode'] == 'file':
             'get file info'
-            #GSASIIpath.IPyBreak()
+            GSASIIpath.IPyBreak()
         else:
             # load copy of Image Controls from current image and clean up
@@ -207 +207 @@
         self.params['MaskFile'] = ''
         self.params['IgnoreMask'] = True
-        self.IntegratedList = []
         fmtlist = G2IO.ExportPowderList(G2frame)
         self.timer = wx.Timer()
@@ -217 +216 @@
         self.params['filter'] = '*'+os.path.splitext(fileroot)[1]
         os.chdir(self.imagedir)
+        # get image names that have already been read
+        self.IntegratedList = []
+        for img in G2gd.GetPatternTreeDataNames(G2frame,['IMG ']):
+            self.IntegratedList.append(G2frame.PatternTree.GetItemPyData(
+                G2gd.GetPatternTreeItemId(G2frame,G2frame.root,img)
+                )[1])
+            
+        GSASIIpath.IPyBreak()
         
         wx.Frame.__init__(self, G2frame)