Changeset 3967 for trunk/fprime.py

Timestamp:

May 11, 2019 10:12:27 AM (2 years ago)

Author:

vondreele

Message:

embed fprime & absorb plots in GSAS-II plot window as separate tabs. This removes conflict between contour plots & fprime/absorb plots

File:

• trunk/fprime.py (modified) (7 diffs)

trunk/fprime.py

@@ -9 +9 @@
 import wx
 import numpy as np
-import matplotlib as mpl
-import matplotlib.pyplot as plt
 import sys
 import GSASIIpath
@@ -231 +229 @@
     def __init__(self, parent):
         self._init_ctrls(parent)
-        mpl.rcParams['axes.grid'] = True
-        mpl.rcParams['legend.fontsize'] = 10
+        self.parent = parent
         self.Lines = []
         self.linePicked = None
         
     def OnFPRIMEExitMenu(self, event):
-        plt.close('all')
+        self.parent.G2plotNB.Delete('Fprime')
         self.Close()
         self.Destroy()
@@ -334 +331 @@
         bxylim = []
         try:
-            self.fplot.canvas.set_window_title('X-Ray Resonant Scattering')
             if rePlot:
-                asb,bsb = self.fplot.get_children()[1:]
+                asb,bsb = self.Page.get_children()[1:]
                 axylim = asb.get_xlim(),asb.get_ylim()
                 bxylim = bsb.get_xlim(),bsb.get_ylim()
             newPlot = False
         except:
-            self.fplot = plt.figure(facecolor='white',figsize=(8,8))  #BTW: default figsize is (8,6)
-            self.fplot.canvas.set_window_title('X-Ray Resonant Scattering')
-            self.fplot.canvas.mpl_connect('pick_event', self.OnPick)
-            self.fplot.canvas.mpl_connect('button_release_event', self.OnRelease)
-            self.fplot.canvas.mpl_connect('motion_notify_event', self.OnMotion)
+            new,plotNum,self.Page,self.fplot,lim = self.parent.G2plotNB.FindPlotTab('Fprime','mpl')
+            self.Page.canvas.mpl_connect('pick_event', self.OnPick)
+            self.Page.canvas.mpl_connect('button_release_event', self.OnRelease)
+            self.Page.canvas.mpl_connect('motion_notify_event', self.OnMotion)
             newPlot = True
-        ax = self.fplot.add_subplot(211)
+        self.fplot.set_visible(False)
+        ax = self.Page.figure.add_subplot(211)
         ax.clear()
         ax.set_title('Resonant Scattering Factors',x=0,ha='left')
@@ -374 +370 @@
         if self.FPPS:
             ax.legend(loc='best')
-        bx = self.fplot.add_subplot(212)
-        self.fplot.subplots_adjust(hspace=0.25)
+        bx = self.Page.figure.add_subplot(212)
+        self.Page.figure.subplots_adjust(hspace=0.25)
         bx.clear()
         if self.ifWave:
@@ -428 +424 @@
         if newPlot:
             newPlot = False
-            plt.show()
+            self.Page.canvas.draw()
         else:
             if rePlot:
-                tb = self.fplot.canvas.toolbar
+                tb = self.Page.canvas.toolbar
                 tb.push_current()
                 ax.set_xlim(axylim[0])
@@ -441 +437 @@
                 bxylim = []
                 tb.push_current()
-            plt.draw()
+            self.Page.canvas.draw()
         
     def OnPick(self, event):
@@ -592 +588 @@
         '''
         wxadv.AboutBox(info)
-
-class FprimeApp(wx.App):
-    ''' '''
-    def OnInit(self):
-        self.main = Fprime(None)
-        self.main.Show()
-        self.SetTopWindow(self.main)
-        self.main.OnFPRIMENewMenu(None)
-        return True
-
-def main():
-    ''' '''
-    application = FprimeApp(0)
-    application.MainLoop()
-
-if __name__ == '__main__':
-    main()