Changeset 683 for trunk/GSASII.py

Timestamp:

Jul 10, 2012 10:23:32 AM (10 years ago)

Author:

vondreele

Message:

fix dlg.Destroy as needed
continue restraints work

File:

• trunk/GSASII.py (modified) (6 diffs)

trunk/GSASII.py

@@ -1226 +1226 @@
             parent.Raise()
             self.EndModal(wx.ID_OK)              
-            #self.Destroy()
             
         def OnCancel(self,event):
@@ -1232 +1231 @@
             parent.Raise()
             self.EndModal(wx.ID_CANCEL)              
-            #self.Destroy()
             
         def GetData(self):
@@ -1341 +1339 @@
             parent.Raise()
             self.EndModal(wx.ID_OK)              
-            #self.Destroy() -- do this later, after using GetData
             
         def OnCancel(self,event):
@@ -1347 +1344 @@
             parent.Raise()
             self.EndModal(wx.ID_CANCEL)              
-            #self.Destroy()
             
         def GetData(self):
@@ -1973 +1969 @@
         HKLFdata['Instrument Parameters'] = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,HKLFname,'Instrument Parameters'))
         return HKLFdata
-                    
-    def GetUsedHistogramsAndPhasesfromTree(self):
-        ''' Returns all histograms that are found in any phase
-        and any phase that uses a histogram
-        return:
-            Histograms = dictionary of histograms as {name:data,...}
-            Phases = dictionary of phases that use histograms
-        '''
+        
+    def GetPhaseData(self):
         phaseData = {}
         if G2gd.GetPatternTreeItemId(self,self.root,'Phases'):
@@ -1991 +1981 @@
             while item:
                 phaseData[self.PatternTree.GetItemText(item)] =  self.PatternTree.GetItemPyData(item)                
-                item, cookie = self.PatternTree.GetNextChild(sub, cookie)                
+                item, cookie = self.PatternTree.GetNextChild(sub, cookie)
+        return phaseData                
+                    
+    def GetUsedHistogramsAndPhasesfromTree(self):
+        ''' Returns all histograms that are found in any phase
+        and any phase that uses a histogram
+        return:
+            Histograms = dictionary of histograms as {name:data,...}
+            Phases = dictionary of phases that use histograms
+        '''
+        phaseData = self.GetPhaseData()
         Histograms = {}
         Phases = {}