Changeset 2416 for trunk

Timestamp:

02/21/12 14:11:09 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-3749)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: an interactive test

1. load casapy (or standalone asap)
2. matplotlib.pyplot.show() ---> 2 plotters (ASAP plotter and matplotlib plotter) are displayed and casapy prompt is paused.
3. close all plotter windows ---> casapy prompt should be back

Put in Release Notes: No

Module(s): sdplot, asap.plotter

Description:

Fixed a bug in asapplotter with Tk backend which caused scripts and python shells
freeze after the initial invocation of matplotlib.pyplot.show() (known as pl.show() on CASA).
plus minor fixes which handle backend dependencies.

Location:

trunk/python

Files:

• asaplotgui.py (modified) (3 diffs)
• asaplotgui_qt4.py (modified) (1 diff)
• asapplotter.py (modified) (2 diffs)
• customgui_tkagg.py (modified) (3 diffs)

trunk/python/asaplotgui.py

@@ -10 +10 @@
 # Force use of the newfangled toolbar.
 matplotlib.rcParams['toolbar'] = 'toolbar2'
+from matplotlib import _pylab_helpers
 
 class asaplotgui(asaplotbase):
@@ -28 +29 @@
         asaplotbase.__init__(self, **v)
         self.window = Tk.Tk()
-        def dest_callback():
-            self.is_dead = True
-            self.window.destroy()
+        #def dest_callback():
+        #    print "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')
 
@@ -61 +66 @@
         """
         self.is_dead = True
-        self.window.destroy()
+        #self.window.destroy()
+        _pylab_helpers.Gcf.destroy(self.figmgr.num)
+        del self.window, self.canvas
+        self.window = None
+        self.canvas = None
+        
 
     def show(self, hardrefresh=True):

trunk/python/asaplotgui_qt4.py

@@ -32 +32 @@
         self.canvas = FigureCanvasQTAgg(self.figure)
         # Simply instantiating this is enough to get a working toolbar.
-        self.figmgr = FigureManagerQTAgg(self.canvas, 1)
+        self.figmgr = FigureManagerQTAgg(self.canvas, 0)
         self.window = self.figmgr.window
         self._set_window_title('ASAP Plotter - Qt4')
-        # register this plot to matplotlib
-        _pylab_helpers.Gcf.set_active(self.figmgr)
+        # Register this plot to matplotlib without activating it
+        #_pylab_helpers.Gcf.set_active(self.figmgr)
+        _pylab_helpers.Gcf.figs[self.figmgr.num] = self.figmgr
 
         #############

trunk/python/asapplotter.py

@@ -1256 +1256 @@
         PL.ion()
         PL.draw()
-        PL.gcf().show()
+        if matplotlib.get_backend() == 'Qt4Agg': PL.gcf().show()
         if (self._outfile is not None):
            PL.savefig(self._outfile)
@@ -1295 +1295 @@
         [xmin,xmax,ymin,ymax] = PL.axis()
         PL.axis([xmax,xmin,ymin,ymax])
-        #PL.ion()
+        PL.ion()
         PL.draw()
-        PL.gcf().show()
+        if matplotlib.get_backend() == 'Qt4Agg': PL.gcf().show()
         if (self._outfile is not None):
            PL.savefig(self._outfile)

trunk/python/customgui_tkagg.py

@@ -135 +135 @@
         self.disable_button()
         self.figmgr.window.wm_withdraw()
+        self._p.quit()
 
     def enable_button(self):
@@ -147 +148 @@
         #self.bSpec.config(relief='raised', state=Tk.DISABLED)
         self.bStat.config(relief='raised', state=Tk.DISABLED)
-        #self.bNext.config(state=Tk.DISABLED)
-        #self.bPrev.config(state=Tk.DISABLED)
+        self.bNext.config(state=Tk.DISABLED)
+        self.bPrev.config(state=Tk.DISABLED)
         self.button = False
         self.mode = ''
@@ -647 +648 @@
         self.disable_button()
         self.figmgr.window.wm_withdraw()
+        self._p.quit()
 
     def enable_button(self):