Changeset 1724

Timestamp:

04/21/10 20:42:50 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1801)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: two classes, CustomToolbarTkAgg? and CustomToolbarCommon?,

are created to a new module casatoolbar

Test Programs: run sdplot with plottype='spectra' and 'totalpower'

Put in Release Notes: Yes/No?

Module(s): CASA task sdplot, sdbaseline, sdstat, sdfit

Description:

Two new classes, CustomToolbarTkAgg? and CustomToolbarCommon?, are
created to a new module casatoolbar in order to remove backend dependency
of sdplot(). The other code are modified accordingly.
The additional toolbar, casabar, is now default in ASAP plotter
(asapplotter.plot and asapplotter.plottp).

Location:

branches/alma/python

Files:

• asapplotter.py (modified) (5 diffs)
• casatoolbar.py (added)
• interactivemask.py (modified) (1 diff)

branches/alma/python/asapplotter.py

@@ -18 +18 @@
             self._visible = visible
         self._plotter = self._newplotter()
+        if self._visible and matplotlib.get_backend() == "TkAgg":
+            from asap.casatoolbar import CustomToolbarTkAgg
+            self._plotter.figmgr.casabar = CustomToolbarTkAgg(self)
 
         self._panelling = None
@@ -50 +53 @@
 
     def _newplotter(self):
-        if self._visible:
+        backend=matplotlib.get_backend()
+        if not self._visible:
+            from asap.asaplot import asaplot
+        elif backend == 'TkAgg':
             from asap.asaplotgui import asaplotgui as asaplot
+        elif backend == 'Qt4Agg':
+            from asap.asaplotgui_qt4 import asaplotgui as asaplot
+        elif backend == 'GTkAgg':
+            from asap.asaplotgui_gtk import asaplotgui as asaplot
         else:
             from asap.asaplot import asaplot
@@ -84 +94 @@
         if self._minmaxy is not None:
             self._plotter.set_limits(ylim=self._minmaxy)
+        if self._plotter.figmgr.casabar: self._plotter.figmgr.casabar.enable_button()
         self._plotter.release()
         self._plotter.tidy()
@@ -1037 +1048 @@
         self._plotter.figure.subplots_adjust(
             left=lef,bottom=bot,right=rig,top=top,wspace=wsp,hspace=hsp)
+        if self._plotter.figmgr.casabar: self._plotter.figmgr.casabar.disable_button()
         self._plottp(self._data)
         if self._minmaxy is not None:
@@ -1153 +1165 @@
             print_log()
         del ssum
+
+

branches/alma/python/interactivemask.py

@@ -159 +159 @@
                         # Need replot
                         self.p.plot(self.scan)
+                        # disable casa toolbar
+                        if self.p._plotter.figmgr.casabar:  self.p._plotter.figmgr.casabar.disable_button()
                         for panel in self.p._plotter.subplots:
                                 xmin, xmax = panel['axes'].get_xlim()