Ignore:
Timestamp:
Apr 17, 2018 5:00:36 PM (4 years ago)
Author:
vondreele
Message:

add new configuration for selecting instprm first
add save.load for PWDR peak fits.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r3346 r3348  
    14971497            pth = G2G.GetImportPath(self)
    14981498            if not pth: pth = '.'
     1499            extOrd = [0,1]
     1500            if GSASIIpath.GetConfigValue('Instprm_default',False):
     1501                extOrd = [1,0]
     1502            extList = ['GSAS iparm file (*.prm,*.inst,*.ins)|*.prm;*.inst;*.ins|','GSAS-II iparm file (*.instprm)|*.instprm|']
    14991503            dlg = wx.FileDialog(self,
    15001504                u'Choose inst. param file for "'+rd.idstring+u'" (or Cancel for default)',
    1501                 pth, '',
    1502                 'GSAS iparm file (*.prm,*.inst,*.ins)|*.prm;*.inst;*.ins|'
    1503                 'GSAS-II iparm file (*.instprm)|*.instprm|'
    1504                 'All files (*.*)|*.*', wx.FD_OPEN)
     1505                pth, '',extList[extOrd[0]]+extList[extOrd[1]]+'All files (*.*)|*.*', wx.FD_OPEN)
    15051506            if os.path.exists(lastIparmfile):
    15061507                dlg.SetFilename(lastIparmfile)
     
    49204921        # PDR / Peak List
    49214922        G2G.Define_wxId('wxID_UNDO', 'wxID_LSQPEAKFIT', 'wxID_LSQONECYCLE', 'wxID_RESETSIGGAM',
    4922             'wxID_CLEARPEAKS', 'wxID_AUTOSEARCH','wxID_PEAKSCOPY', 'wxID_SEQPEAKFIT',)
     4923            'wxID_CLEARPEAKS', 'wxID_AUTOSEARCH','wxID_PEAKSCOPY', 'wxID_SEQPEAKFIT','wxID_PEAKLOAD','wxID_PEAKSAVE')
    49234924        self.PeakMenu = wx.MenuBar()
    49244925        self.PrefillDataMenu(self.PeakMenu)
     
    49334934        self.PeakEdit.Append(G2G.wxID_RESETSIGGAM,'Reset sig and gam','Reset sigma and gamma to global fit' )
    49344935        self.PeakCopy = self.PeakEdit.Append(G2G.wxID_PEAKSCOPY,'Peak copy','Copy peaks to other histograms')
     4936        self.PeakEdit.Append(G2G.wxID_PEAKLOAD,'Load peaks...','Load peak list from file')
     4937        self.PeakEdit.Append(G2G.wxID_PEAKSAVE,'Save peaks...','Save peak list to file')
    49354938        self.SeqPeakFit = self.PeakEdit.Append(G2G.wxID_SEQPEAKFIT,'Seq PeakFit',
    49364939            'Sequential Peak fitting for all histograms' )
Note: See TracChangeset for help on using the changeset viewer.