Changeset 2048

Timestamp:

Nov 12, 2015 5:15:56 PM (8 years ago)

Author:

toby

Message:

move list of PWDR tree items to delete so they are saved

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• autoint.py (modified) (4 diffs)

trunk/GSASII.py

@@ -2252 +2252 @@
         self.imageDefault = {}
         self.IntgOutList = [] # list of integration tree item Ids created in G2IO.SaveIntegration
+        self.AutointPWDRnames = [] # list of autoint created PWDR tree item names
         self.autoIntFrame = None
         self.IntegratedList = [] # list of integrated image files

trunk/autoint.py

@@ -92 +92 @@
             for Id in G2frame.IntgOutList:
                 treename = G2frame.PatternTree.GetItemText(Id)
-                self.CreatedPWDRnames.append(treename)
+                self.G2frame.AutointPWDRnames.append(treename)
                 Sdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Sample Parameters'))
                 # determine the name for the current file
@@ -162 +162 @@
             while item:
                 itemName = G2frame.PatternTree.GetItemText(item)
-                if itemName in self.CreatedPWDRnames:
+                if itemName in self.G2frame.AutointPWDRnames:
                     idlist.append(item)
                 item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
@@ -168 +168 @@
                 G2frame.PatternTree.Delete(item)
         self.Reset = False
-        self.CreatedPWDRnames = [] # list of created PWDR tree item names
+        self.G2frame.AutointPWDRnames = [] # list of created PWDR tree item names
 
     def __init__(self,G2frame,PollTime=60.0):
@@ -310 +310 @@
         self.params['filter'] = '*'+os.path.splitext(fileroot)[1]
         self.params['outdir'] = os.path.abspath(self.imagedir)
-        self.CreatedPWDRnames = [] # list of created PWDR tree item names
         wx.Frame.__init__(self, G2frame,title='Automatic Integration')
         self.Status = self.CreateStatusBar()