Changeset 3485

Timestamp:

Jul 18, 2018 3:46:38 PM (5 years ago)

Author:

vondreele

Message:

made suggested change from Jeremy Kropf for reading in multiple peak lists.

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -5000 +5000 @@
     ['TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm', 'Combined X-ray/TOF-neutron Rietveld refinement',
      '''This shows Rietveld refinement with high resolution synchrotron powder data and neutron TOF data'''],
-    ['SimpleMagnetic', 'SimpleMagnetic.htm',"Simple Magnetic Structure Analysis",
+    ['SimpleMagnetic', 'Simple Magnetic.htm',"Simple Magnetic Structure Analysis",
      '''Analysis of a simple antiferromagnet and a simple ferromagnet from CW neutron powder data'''],
     ['Simulation', 'SimTutorial.htm',  'Simulating Powder Diffraction with GSAS-II',

trunk/GSASIIdataGUI.py

@@ -2910 +2910 @@
         if not pth: pth = '.'
         dlg = wx.FileDialog(self, 'Choose file with peak list', pth, '', 
-            'peak files (*.txt)|*.txt|All files (*.*)|*.*',wx.FD_OPEN)
+            'peak files (*.txt)|*.txt|All files (*.*)|*.*',wx.FD_MULTIPLE)
         try:
             if dlg.ShowModal() == wx.ID_OK:
-                self.HKL = []
-                self.powderfile = dlg.GetPath()
-                comments,peaks,limits,wave = G2IO.GetPowderPeaks(self.powderfile)
-                Id = self.GPXtree.AppendItem(parent=self.root,text='PKS '+os.path.basename(self.powderfile))
-                data = ['PKS',wave,0.0]
-                names = ['Type','Lam','Zero'] 
-                codes = [0,0,0]
-                inst = [G2fil.makeInstDict(names,data,codes),{}]
-                self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Instrument Parameters'),inst)
-                self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Comments'),comments)
-                self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Limits'),[tuple(limits),limits])
-                self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Index Peak List'),[peaks,[]])
-                self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Unit Cells List'),[])             
-                self.GPXtree.Expand(Id)
-                self.GPXtree.SelectItem(Id)
+                for file_ajk in dlg.GetPaths():
+                    self.HKL = []
+                    self.powderfile = file_ajk
+                    comments,peaks,limits,wave = G2IO.GetPowderPeaks(self.powderfile)
+                    Id = self.GPXtree.AppendItem(parent=self.root,text='PKS '+os.path.basename(self.powderfile))
+                    data = ['PKS',wave,0.0]
+                    names = ['Type','Lam','Zero'] 
+                    codes = [0,0,0]
+                    inst = [G2fil.makeInstDict(names,data,codes),{}]
+                    self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Instrument Parameters'),inst)
+                    self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Comments'),comments)
+                    self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Limits'),[tuple(limits),limits])
+                    self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Index Peak List'),[peaks,[]])
+                    self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Unit Cells List'),[])             
+                    self.GPXtree.Expand(Id)
+                    self.GPXtree.SelectItem(Id)
                 os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!
         finally: