Changeset 2538 for trunk

Timestamp:

05/18/12 19:44:44 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (related to CAS-3749)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added a new method, _alive(), in asaplotbase class

Test Programs: Interactive tests

Put in Release Notes: No

Module(s):

Description:

Added a new method, _alive(), in asaplotbase class. The method return True
if asaplot instance is alive. More complete check compared to 'is_dead' parameter.
asapplotter._assert_plotter method is simplified by calling this function.

Fixed misc bugs found in interactive tests.

1. set back linewidth = 1 in plots invoked by modules, interactivemask, asapmath, and asapfitter.
2. interactivemask module: plotter in properly quited at the end.
3. interactivemask module: avoid error when user close interacive plot window before calling the finalization method, finish_selection().
4. added definition of a dummy function, quit(), in asaplot class.

Location:

trunk/python

Files:

• asapfitter.py (modified) (1 diff)
• asaplot.py (modified) (2 diffs)
• asaplotbase.py (modified) (2 diffs)
• asapmath.py (modified) (1 diff)
• asapplotter.py (modified) (1 diff)
• interactivemask.py (modified) (3 diffs)

trunk/python/asapfitter.py

@@ -541 +541 @@
                          on the plot
         """
+        from matplotlib import rc as rcp
         if not self.fitted:
             return

trunk/python/asaplot.py

@@ -26 +26 @@
         self.window = None
         self.canvas = FigureCanvasAgg(self.figure)
-        self.figmgr = FigureManagerBase(self.canvas,1)
+        self.figmgr = FigureManagerBase(self.canvas,0)
         # This seems necessary when using Gcf, as this is done in
         # pyplot.figure. Otherwise this can cause atexit errors at cleanup
@@ -32 +32 @@
         self.figmgr._cidgcf = None
         _pylab_helpers.Gcf.figs[self.figmgr.num] = self.figmgr
+
+    def quit(self):
+        # never dextroy non-GUI plotter.
+        pass
 
     def map(self):

trunk/python/asaplotbase.py

@@ -12 +12 @@
 from matplotlib import rc, rcParams
 from matplotlib.ticker import OldScalarFormatter
+from matplotlib import _pylab_helpers
 
 from asap.parameters import rcParams as asaprcParams
@@ -850 +851 @@
                     rotation=rotate,transform = trans)
         self.axes.set_autoscale_on(True)
+
+    def _alive(self):
+        # Return True if the GUI alives.
+        if (not self.is_dead) and \
+               self.figmgr and hasattr(self.figmgr, "num"):
+            figid = self.figmgr.num
+            # Make sure figid=0 is what asapplotter expects.
+            # It might be already destroied/overridden by matplotlib
+            # commands or other methods using asaplot.
+            return _pylab_helpers.Gcf.has_fignum(figid) and \
+                   (self.figmgr == _pylab_helpers.Gcf.get_fig_manager(figid))
+        return False

trunk/python/asapmath.py

@@ -3 +3 @@
 from asap.logging import asaplog, asaplog_post_dec
 from asap.selector import selector
-#from asap import asaplotgui
 from asap.asapplotter import new_asaplot
+from matplotlib import rc as rcp
 
 @asaplog_post_dec

trunk/python/asapplotter.py

@@ -140 +140 @@
                        when plot window is not alive.
         """
-        isAlive = (self._plotter != None and not self._plotter.is_dead)
+        isAlive = (self._plotter is not None) and self._plotter._alive()
         # More tests
-        if isAlive:
-            if self._plotter.figmgr:
-                figmgr = self._plotter.figmgr
-                figid = figmgr.num
-                # Make sure figid=0 is what asapplotter expects.
-                # It might be already destroied/overridden by matplotlib
-                # commands or other plotting methods using asaplot.
-                isAlive = _pylab_helpers.Gcf.has_fignum(figid) and \
-                          (figmgr == \
-                           _pylab_helpers.Gcf.get_fig_manager(figid))
-            else:
-                isAlive = False
+        #if isAlive:
+        #    if self._plotter.figmgr:
+        #        figmgr = self._plotter.figmgr
+        #        figid = figmgr.num
+        #        # Make sure figid=0 is what asapplotter expects.
+        #        # It might be already destroied/overridden by matplotlib
+        #        # commands or other plotting methods using asaplot.
+        #        isAlive = _pylab_helpers.Gcf.has_fignum(figid) and \
+        #                  (figmgr == \
+        #                   _pylab_helpers.Gcf.get_fig_manager(figid))
+        #    else:
+        #        isAlive = False
             
         if isAlive:

trunk/python/interactivemask.py

@@ -156 +156 @@
             self.showmask = True
 
-        #if not self.p._plotter or self.p._plotter.is_dead:
         if not self.p:
             asaplog.push('A new ASAP plotter will be loaded')
@@ -164 +163 @@
             self.newplot = True
         self.p._assert_plotter(action='reload')
+        from matplotlib import rc as rcp
+        rcp('lines', linewidth=1)
         
         # Plot selected spectra if needed
@@ -339 +340 @@
         if callback: self.callback=callback
         if self.callback: self.callback()
-        if not self.event: self.p._plotter.register('button_press',None)
+        if not self.event:
+            try: self.p._plotter.register('button_press',None)
+            except: pass # plotter window is closed by X button.
         # Finish the plot
         if not self.newplot:
             self.clear_polygon()
         else:
-            self.p._plotter.unmap()
+            #self.p._plotter.unmap()
+            self.p._plotter.quit()
             self.p._plotter = None
             del self.p