Changes in trunk/python/asaplotgui.py [2170:2469]

File:

• trunk/python/asaplotgui.py (modified) (7 diffs)

trunk/python/asaplotgui.py

@@ -10 +10 @@
 # Force use of the newfangled toolbar.
 matplotlib.rcParams['toolbar'] = 'toolbar2'
+from matplotlib import _pylab_helpers
+from asap.logging import asaplog, asaplog_post_dec
 
 class asaplotgui(asaplotbase):
@@ -27 +29 @@
 
         asaplotbase.__init__(self, **v)
+        #matplotlib.rcParams["interactive"] = True
+
+        _pylab_helpers.Gcf.destroy(0)
         self.window = Tk.Tk()
-        def dest_callback():
-            self.is_dead = True
-            self.window.destroy()
-
-        self.window.protocol("WM_DELETE_WINDOW", dest_callback)
+        self.window.protocol("WM_DELETE_WINDOW", self.quit)
         self.canvas = FigureCanvasTkAgg(self.figure, master=self.window)
         self.canvas.get_tk_widget().pack(side=Tk.TOP, fill=Tk.BOTH, expand=1)
         # Simply instantiating this is enough to get a working toolbar.
-        self.figmgr = FigureManagerTkAgg(self.canvas, 1, self.window)
+        self.figmgr = FigureManagerTkAgg(self.canvas, 0, self.window)
+        # Register this plot to matplotlib without activating it
+        #_pylab_helpers.Gcf.set_active(self.figmgr)
+        _pylab_helpers.Gcf.figs[self.figmgr.num] = self.figmgr
         self._set_window_title('ASAP Plotter - Tk')
+        self.canvas.show()
 
-        self.events = {'button_press':None,
-                       'button_release':None,
-                       'motion_notify':None}
-
-        matplotlib.rcParams["interactive"] = True
-        #self.buffering = buffering
-
-        self.canvas.show()
 
     def map(self):
@@ -53 +50 @@
         window stack.
         """
+        if self.is_dead:
+            raise RuntimeError( "No plotter to show. Not yet plotted or plotter is closed." )
         self.window.wm_deiconify()
         self.window.lift()
@@ -61 +60 @@
         """
         self.is_dead = True
-        self.window.destroy()
+        if not self.figmgr:
+            return
+        #self.window.destroy()
+        _pylab_helpers.Gcf.destroy(self.figmgr.num)
+        del self.window, self.canvas, self.figmgr
+        self.window = None
+        self.canvas = None
+        self.figmgr = None
 
     def show(self, hardrefresh=True):
@@ -67 +73 @@
         Show graphics dependent on the current buffering state.
         """
+        if self.is_dead:
+            raise RuntimeError( "No plotter to show (not yet plotted or closed)." )
         if not self.buffering:
             if hardrefresh:
@@ -77 +85 @@
         Clear the figure.
         """
+        if not self.window:
+            asaplog.push( "No plotter window to terminate." )
+            asaplog.post( "WARN" )
+            return
         self.window.destroy()
 
@@ -83 +95 @@
         Hide the ASAPlot graphics window.
         """
+        if not self.window:
+            asaplog.push( "No plotter window to unmap." )
+            asaplog.post( "WARN" )
+            return
         self.window.wm_withdraw()