Changeset 683 for trunk/GSASII.py


Ignore:
Timestamp:
Jul 10, 2012 10:23:32 AM (10 years ago)
Author:
vondreele
Message:

fix dlg.Destroy as needed
continue restraints work

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r682 r683  
    12261226            parent.Raise()
    12271227            self.EndModal(wx.ID_OK)             
    1228             #self.Destroy()
    12291228           
    12301229        def OnCancel(self,event):
     
    12321231            parent.Raise()
    12331232            self.EndModal(wx.ID_CANCEL)             
    1234             #self.Destroy()
    12351233           
    12361234        def GetData(self):
     
    13411339            parent.Raise()
    13421340            self.EndModal(wx.ID_OK)             
    1343             #self.Destroy() -- do this later, after using GetData
    13441341           
    13451342        def OnCancel(self,event):
     
    13471344            parent.Raise()
    13481345            self.EndModal(wx.ID_CANCEL)             
    1349             #self.Destroy()
    13501346           
    13511347        def GetData(self):
     
    19731969        HKLFdata['Instrument Parameters'] = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,HKLFname,'Instrument Parameters'))
    19741970        return HKLFdata
    1975                    
    1976     def GetUsedHistogramsAndPhasesfromTree(self):
    1977         ''' Returns all histograms that are found in any phase
    1978         and any phase that uses a histogram
    1979         return:
    1980             Histograms = dictionary of histograms as {name:data,...}
    1981             Phases = dictionary of phases that use histograms
    1982         '''
     1971       
     1972    def GetPhaseData(self):
    19831973        phaseData = {}
    19841974        if G2gd.GetPatternTreeItemId(self,self.root,'Phases'):
     
    19911981            while item:
    19921982                phaseData[self.PatternTree.GetItemText(item)] =  self.PatternTree.GetItemPyData(item)               
    1993                 item, cookie = self.PatternTree.GetNextChild(sub, cookie)               
     1983                item, cookie = self.PatternTree.GetNextChild(sub, cookie)
     1984        return phaseData               
     1985                   
     1986    def GetUsedHistogramsAndPhasesfromTree(self):
     1987        ''' Returns all histograms that are found in any phase
     1988        and any phase that uses a histogram
     1989        return:
     1990            Histograms = dictionary of histograms as {name:data,...}
     1991            Phases = dictionary of phases that use histograms
     1992        '''
     1993        phaseData = self.GetPhaseData()
    19941994        Histograms = {}
    19951995        Phases = {}
Note: See TracChangeset for help on using the changeset viewer.