Changeset 2535 for trunk/python

Timestamp:

05/17/12 19:00:47 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-3749/TRAC-266)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

interactive tests are required

1. on CASA

(1) plot something by CASA sdplot task
(2) run CASA sdfit with plotlevel!=0
(3) close plotter window by pressing X button on the window
(4) plot something by sdplot task again.

1. on stand-alone ASAP

(1) plot something by asapplotter
(2) run asapfitter.auto_fit with plot=T
(3) plot something by asapplotter again

Put in Release Notes: No

Module(s): sdplot, asapplotter

Description:

Fixed a bug which caused sdplot and asapplotter crash after closing
plotter loaded by the other modules (tasks) with X button. It was
a bug caused by the fact ID numbers of figure managers are
identical in both sdplot (asapplotter) and the other plotter.
It is also possible, that user loads plotter with the ID identical
to asapplotter and overrides it. This is because, user can select
arbitrary ID when generating a new plot.

asap.plotter._assert_plotter does more tests to make sure the
previous plotter GUI is alive, and properly reloads plotter if not.

Also some minor fixes to reset linewidth for plot invoked by
modules other than asapplot/sdplot, i.e., scantable, asapfitter,
and asapmath.

Location:

trunk/python

Files:

• asapfitter.py (modified) (1 diff)
• asapmath.py (modified) (3 diffs)
• asapplotter.py (modified) (3 diffs)
• scantable.py (modified) (2 diffs)

trunk/python/asapfitter.py

@@ -549 +549 @@
         self._p.hold()
         self._p.clear()
+        rcp('lines', linewidth=1)
         self._p.set_panels()
         self._p.palette(0)

trunk/python/asapmath.py

@@ -312 +312 @@
         asaplog.post('WARN')
         p=new_asaplot()
+        rcp('lines', linewidth=1)
         #nr=min(6,len(ifnos)*len(polnos))
         nr=len(ifnos)*len(polnos)
@@ -531 +532 @@
         asaplog.post('WARN')
         p=new_asaplot()
+        rcp('lines', linewidth=1)
         #nr=min(6,len(ifnos)*len(polnos))
         nr=len(ifnos)*len(polnos)
@@ -741 +743 @@
         asaplog.post('WARN')
         p=new_asaplot()
+        rcp('lines', linewidth=1)
         #nr=min(6,len(ifnos)*len(polnos))
         nr=len(ifnos)/2*len(polnos)

trunk/python/asapplotter.py

@@ -6 +6 @@
 from matplotlib.font_manager import FontProperties
 from matplotlib.text import Text
+from matplotlib import _pylab_helpers
 
 import re
@@ -86 +87 @@
         return None
 
+    @asaplog_post_dec
     def _reload_plotter(self):
         if self._plotter is not None:
-            if  not self._plotter.is_dead:
-                # clear lines and axes
-                self._plotter.clear()
+            #if not self._plotter.is_dead:
+            #    # clear lines and axes
+            #    try:
+            #        self._plotter.clear()
+            #    except: # Can't remove when already killed.
+            #        pass
             if self.casabar_exists():
                 del self._plotter.figmgr.casabar
             self._plotter.quit()
             del self._plotter
+        asaplog.push('Loading new plotter')
         self._plotter = new_asaplot(self._visible,**self._inikwg)
         self._plotter.figmgr.casabar=self._new_custombar()
@@ -134 +140 @@
                        when plot window is not alive.
         """
-        if self._plotter and not self._plotter.is_dead:
+        isAlive = (self._plotter != None and not self._plotter.is_dead)
+        # 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:
             return True
         # Plotter is not alive.

trunk/python/scantable.py

@@ -2265 +2265 @@
             from asap.asapplotter import new_asaplot
             theplot = new_asaplot(rcParams['plotter.gui'])
+            from matplotlib import rc as rcp
+            rcp('lines', linewidth=1)
             theplot.set_panels()
             ylab=s._get_ordinate_label()
@@ -2336 +2338 @@
 #             from asap.asapplotter import new_asaplot
 #             theplot = new_asaplot(rcParams['plotter.gui'])
+#             from matplotlib import rc as rcp
+#             rcp('lines', linewidth=1)
 #             theplot.set_panels()
 #             ylab=s._get_ordinate_label()