Changeset 2645 for trunk/GSASIIgrid.py

Timestamp:

Jan 18, 2017 7:00:20 PM (5 years ago)

Author:

toby

Message:

improve PDF opt; add PDF opt to Compute All PDFs; rename to Setup PDFs

File:

• trunk/GSASIIgrid.py (modified) (8 diffs)

trunk/GSASIIgrid.py

@@ -150 +150 @@
 
 [ wxID_PDFCOPYCONTROLS, wxID_PDFSAVECONTROLS, wxID_PDFLOADCONTROLS, 
-    wxID_PDFCOMPUTE, wxID_PDFCOMPUTEALL, wxID_PDFADDELEMENT, wxID_PDFDELELEMENT, wxID_PDFOPT, 
-] = [wx.NewId() for item in range(8)]
+    wxID_PDFCOMPUTE, wxID_PDFCOMPUTEALL, wxID_PDFADDELEMENT, wxID_PDFDELELEMENT, #wxID_PDFOPT, 
+] = [wx.NewId() for item in range(7)]
 
 [ wxID_MCRON,wxID_MCRLIST,wxID_MCRSAVE,wxID_MCRPLAY,
@@ -2177 +2177 @@
         self.PDFEdit.Append(help='Compute all PDFs', id=wxID_PDFCOMPUTEALL, kind=wx.ITEM_NORMAL,
             text='Compute all PDFs')
-        self.PDFEdit.Append(help='Optimize PDF', id=wxID_PDFOPT, kind=wx.ITEM_NORMAL,
-            text='Optimize corrections for r<Rmin section of current G(r)')
+#        self.PDFEdit.Append(help='Optimize PDF', id=wxID_PDFOPT, kind=wx.ITEM_NORMAL,
+#            text='Optimize corrections for r<Rmin section of current G(r)')
         self.PostfillDataMenu()
         
@@ -4552 +4552 @@
         elif G2frame.PatternTree.GetItemText(item).startswith('PDF '):
             G2frame.PatternId = item
-            for i in G2frame.ExportPDF: i.Enable(True)
+            for i in G2frame.ExportPDF: i.Enable(True) # this should be done on .gpx load; is done on OnMakePDFs (GSASII.py)
+            data = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,item,'PDF Controls'))
+            G2pdG.UpdatePDFGrid(G2frame,data)
             G2plt.PlotISFG(G2frame,plotType='S(Q)')
         elif G2frame.PatternTree.GetItemText(item) == 'Phases':
@@ -4559 +4561 @@
                 value='Select one phase to see its parameters')            
     elif 'I(Q)' in G2frame.PatternTree.GetItemText(item):
+        for i in G2frame.ExportPDF: i.Enable(True) # this should be done on .gpx load; is done on OnMakePDFs (GSASII.py)
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
         data = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,G2frame.PatternId,'PDF Controls'))
@@ -4564 +4567 @@
         G2plt.PlotISFG(G2frame,plotType='I(Q)',newPlot=True)
     elif 'S(Q)' in G2frame.PatternTree.GetItemText(item):
+        for i in G2frame.ExportPDF: i.Enable(True) # this should be done on .gpx load; is done on OnMakePDFs (GSASII.py)
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
         data = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,G2frame.PatternId,'PDF Controls'))
@@ -4569 +4573 @@
         G2plt.PlotISFG(G2frame,plotType='S(Q)',newPlot=True)
     elif 'F(Q)' in G2frame.PatternTree.GetItemText(item):
+        for i in G2frame.ExportPDF: i.Enable(True) # this should be done on .gpx load; is done on OnMakePDFs (GSASII.py)
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
         data = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,G2frame.PatternId,'PDF Controls'))
@@ -4574 +4579 @@
         G2plt.PlotISFG(G2frame,plotType='F(Q)',newPlot=True)
     elif 'G(R)' in G2frame.PatternTree.GetItemText(item):
+        for i in G2frame.ExportPDF: i.Enable(True) # this should be done on .gpx load; is done on OnMakePDFs (GSASII.py)
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
         data = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,G2frame.PatternId,'PDF Controls'))
         G2pdG.UpdatePDFGrid(G2frame,data)
         G2plt.PlotISFG(G2frame,plotType='G(R)',newPlot=True)            
+    elif G2frame.PatternTree.GetItemText(item) == 'PDF Controls':
+        for i in G2frame.ExportPDF: i.Enable(True) # this should be done on .gpx load; is done on OnMakePDFs (GSASII.py)
+        G2frame.dataFrame.helpKey = G2frame.PatternTree.GetItemText(item) # special treatment to avoid PDF_PDF Controls
+        G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
+        data = G2frame.PatternTree.GetItemPyData(item)
+        G2pdG.UpdatePDFGrid(G2frame,data)
+        G2plt.PlotISFG(G2frame,plotType='I(Q)')
+        G2plt.PlotISFG(G2frame,plotType='S(Q)')
+        G2plt.PlotISFG(G2frame,plotType='F(Q)')
+        G2plt.PlotISFG(G2frame,plotType='G(R)')
     elif G2frame.PatternTree.GetItemText(parentID) == 'Phases':
         data = G2frame.PatternTree.GetItemPyData(item)
@@ -4614 +4630 @@
         G2plt.PlotImage(G2frame,newPlot=False)
         G2imG.UpdateStressStrain(G2frame,strsta)
-    elif G2frame.PatternTree.GetItemText(item) == 'PDF Controls':
-        G2frame.dataFrame.helpKey = G2frame.PatternTree.GetItemText(item) # special treatment, not PDF_PDF Controls
-        G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
-        for i in G2frame.ExportPDF: i.Enable(True)
-        data = G2frame.PatternTree.GetItemPyData(item)
-        G2pdG.UpdatePDFGrid(G2frame,data)
-        G2plt.PlotISFG(G2frame,plotType='I(Q)')
-        G2plt.PlotISFG(G2frame,plotType='S(Q)')
-        G2plt.PlotISFG(G2frame,plotType='F(Q)')
-        G2plt.PlotISFG(G2frame,plotType='G(R)')
     elif G2frame.PatternTree.GetItemText(item) == 'Peak List':
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)