Changeset 2673

Timestamp:

Jan 30, 2017 10:05:43 AM (7 years ago)

Author:

vondreele

Message:

moved GetFileList? to top of G2pwdGUI - needed in two places. The one on GSASII doesn't seem to work & isn't used anywhere.
Put missing import of G2elem & tof2q lambda in G2imgGUI.

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (6 diffs)

trunk/GSASIIimgGUI.py

@@ -30 +30 @@
 import GSASIIimage as G2img
 import GSASIImath as G2mth
+import GSASIIElem as G2elem
 import GSASIIpwdGUI as G2pdG
 import GSASIIplot as G2plt
@@ -47 +48 @@
 asind = lambda x: 180.*math.asin(x)/math.pi
 tth2q = lambda t,w:4.0*math.pi*sind(t/2.0)/w
+tof2q = lambda t,C:2.0*math.pi*C/t
 atand = lambda x: 180.*math.atan(x)/math.pi
 atan2d = lambda y,x: 180.*math.atan2(y,x)/math.pi
@@ -2826 +2828 @@
                 Qlimits = [0.9*qMax,qMax]
 
-                PWDRname = pwdr[4:]
                 item = pwdr
                 Comments = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(

trunk/GSASIIpwdGUI.py

@@ -212 +212 @@
     return {'Substances':{'vacuum':{'Elements':{},'Volume':1.0,'Density':0.0,'Scatt density':0.0}}}
 
+def GetFileList(G2frame,fileType):
+    fileList = []
+    id, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
+    while id:
+        name = G2frame.PatternTree.GetItemText(id)
+        if fileType in name.split()[0]:
+            fileList.append(name)
+        id, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
+    return fileList
+        
 def GetHistsLikeSelected(G2frame):
     '''Get the histograms that match the current selected one:
@@ -4747 +4757 @@
         
         item = data[key]
-        fileList = [''] + GetFileList('PWDR')
+        fileList = [''] + GetFileList(G2frame,'PWDR')
         fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' '+key+' file:'),0,WACV)
         fileName = wx.ComboBox(G2frame.dataDisplay,value=item['Name'],choices=fileList,
@@ -4852 +4862 @@
         wx.CallAfter(OnComputePDF,None)
 
-    def GetFileList(fileType):
-        fileList = []
-        id, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
-        while id:
-            name = G2frame.PatternTree.GetItemText(id)
-            if fileType in name.split()[0]:
-                fileList.append(name)
-            id, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
-        return fileList
-        
     def OnCopyPDFControls(event):
         import copy
-        TextList = GetFileList('PDF')
+        TextList = GetFileList(G2frame,'PDF')
         Source = G2frame.PatternTree.GetItemText(G2frame.PatternId)
         if len(TextList) == 1:
@@ -5321 +5321 @@
         return peakBox
         
+    def OnCopyPDFPeaks(event):
+        import copy
+        TextList = GetFileList(G2frame,'PDF')
+        Source = G2frame.PatternTree.GetItemText(G2frame.PatternId)
+        if len(TextList) == 1:
+            G2frame.ErrorDialog('Nothing to copy controls to','There must be more than one "PDF" pattern')
+            return
+        dlg = G2G.G2MultiChoiceDialog(G2frame,'Copy PDF peaks','Copy peaks from '+Source+' to:',TextList)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                PDFlist = [TextList[i] for i in dlg.GetSelections()]
+                for item in PDFlist:
+                    id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
+                    olddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'PDF Peaks'))
+                    olddata.update(copy.deepcopy(peaks))
+                    G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'PDF Peaks'),olddata)
+                Status.SetStatusText('PDF peaks copied')
+        finally:
+            dlg.Destroy()
+        
+    def OnFitPDFpeaks(event):
+        print 'fit peaks'
+        
+    def OnFitAllPDFpeaks(event):
+        print 'fit all pdf peaks'
+        
 
     if G2frame.dataDisplay:
@@ -5328 +5354 @@
         Status = G2frame.dataFrame.CreateStatusBar()    
     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
-#    G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopyPDFControls, id=G2gd.wxID_PDFCOPYCONTROLS)
-#    G2frame.dataFrame.Bind(wx.EVT_MENU, OnSavePDFControls, id=G2gd.wxID_PDFSAVECONTROLS)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopyPDFPeaks, id=G2gd.wxID_PDFCOPYPEAKS)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitPDFpeaks, id=G2gd.wxID_PDFPKSFIT)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitAllPDFpeaks, id=G2gd.wxID_PDFPKSFITALL)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add((5,5),0) 
@@ -5343 +5370 @@
     G2frame.dataDisplay.SetSizer(mainSizer)
     Size = mainSizer.Fit(G2frame.dataFrame)
-    Size = (500,300)
     G2frame.dataFrame.setSizePosLeft(Size)