Changeset 3348 for trunk/GSASIIdataGUI.py

Timestamp:

Apr 17, 2018 5:00:36 PM (5 years ago)

Author:

vondreele

Message:

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

File:

• trunk/GSASIIdataGUI.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -1497 +1497 @@
             pth = G2G.GetImportPath(self)
             if not pth: pth = '.'
+            extOrd = [0,1]
+            if GSASIIpath.GetConfigValue('Instprm_default',False):
+                extOrd = [1,0]
+            extList = ['GSAS iparm file (*.prm,*.inst,*.ins)|*.prm;*.inst;*.ins|','GSAS-II iparm file (*.instprm)|*.instprm|']
             dlg = wx.FileDialog(self,
                 u'Choose inst. param file for "'+rd.idstring+u'" (or Cancel for default)',
-                pth, '',
-                'GSAS iparm file (*.prm,*.inst,*.ins)|*.prm;*.inst;*.ins|'
-                'GSAS-II iparm file (*.instprm)|*.instprm|'
-                'All files (*.*)|*.*', wx.FD_OPEN)
+                pth, '',extList[extOrd[0]]+extList[extOrd[1]]+'All files (*.*)|*.*', wx.FD_OPEN)
             if os.path.exists(lastIparmfile):
                 dlg.SetFilename(lastIparmfile)
@@ -4920 +4921 @@
         # PDR / Peak List
         G2G.Define_wxId('wxID_UNDO', 'wxID_LSQPEAKFIT', 'wxID_LSQONECYCLE', 'wxID_RESETSIGGAM', 
-            'wxID_CLEARPEAKS', 'wxID_AUTOSEARCH','wxID_PEAKSCOPY', 'wxID_SEQPEAKFIT',)
+            'wxID_CLEARPEAKS', 'wxID_AUTOSEARCH','wxID_PEAKSCOPY', 'wxID_SEQPEAKFIT','wxID_PEAKLOAD','wxID_PEAKSAVE')
         self.PeakMenu = wx.MenuBar()
         self.PrefillDataMenu(self.PeakMenu)
@@ -4933 +4934 @@
         self.PeakEdit.Append(G2G.wxID_RESETSIGGAM,'Reset sig and gam','Reset sigma and gamma to global fit' )
         self.PeakCopy = self.PeakEdit.Append(G2G.wxID_PEAKSCOPY,'Peak copy','Copy peaks to other histograms')
+        self.PeakEdit.Append(G2G.wxID_PEAKLOAD,'Load peaks...','Load peak list from file')
+        self.PeakEdit.Append(G2G.wxID_PEAKSAVE,'Save peaks...','Save peak list to file')
         self.SeqPeakFit = self.PeakEdit.Append(G2G.wxID_SEQPEAKFIT,'Seq PeakFit', 
             'Sequential Peak fitting for all histograms' )