Changeset 2451 for trunk/python/asaplotgui.py

Timestamp:

03/30/12 19:58:59 (12 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: unit tests of sdplot

Put in Release Notes: No

Module(s): sdplot, sdfit, sdstat, sdflag, sdcal, sdreduce

Description:

Made asapplotter not to generate plotter window at start-up, but the window is
only generated at the first invokation of plotting operation.

File:

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

trunk/python/asaplotgui.py

@@ -11 +11 @@
 matplotlib.rcParams['toolbar'] = 'toolbar2'
 from matplotlib import _pylab_helpers
+from asap.logging import asaplog, asaplog_post_dec
 
 class asaplotgui(asaplotbase):
@@ -28 +29 @@
 
         asaplotbase.__init__(self, **v)
+        #matplotlib.rcParams["interactive"] = True
+
+        _pylab_helpers.Gcf.destroy(0)
         self.window = Tk.Tk()
-        #def dest_callback():
-        #    print "dest_callback"
-        #    self.is_dead = True
-        #    self.window.destroy()
-
         self.window.protocol("WM_DELETE_WINDOW", self.quit)
         self.canvas = FigureCanvasTkAgg(self.figure, master=self.window)
@@ -43 +42 @@
         _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):
@@ -58 +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()
@@ -66 +60 @@
         """
         self.is_dead = True
+        if not self.figmgr:
+            return
         #self.window.destroy()
         _pylab_helpers.Gcf.destroy(self.figmgr.num)
-        del self.window, self.canvas
+        del self.window, self.canvas, self.figmgr
         self.window = None
         self.canvas = None
-        
+        self.figmgr = None
 
     def show(self, hardrefresh=True):
@@ -77 +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:
@@ -87 +85 @@
         Clear the figure.
         """
+        if not self.window:
+            asaplog.push( "No plotter window to terminate." )
+            asaplog.post( "WARN" )
+            return
         self.window.destroy()
 
@@ -93 +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()