Changeset 2147 for trunk/python

Timestamp:

04/18/11 20:20:40 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (a minor imporvement)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added a method asapplotter.casabar_exist()

Test Programs:

Put in Release Notes: No

Module(s): asapplotter, sdplot

Description:

added a method asapplotter.casabar_exist() which tells whether or not casa toolbar exists.

File:

• trunk/python/asapplotter.py (modified) (6 diffs)

trunk/python/asapplotter.py

@@ -88 +88 @@
         return None
 
+    def casabar_exists(self):
+        if not hasattr(self._plotter.figmgr,'casabar'):
+            return False
+        elif self._plotter.figmgr.casabar:
+            return True
+        return False
+
     @asaplog_post_dec
     def plot(self, scan=None):
@@ -104 +111 @@
         self._reset_header()
         if self._plotter.is_dead:
-            if hasattr(self._plotter.figmgr,'casabar'):
+            if self.casabar_exists():
                 del self._plotter.figmgr.casabar
             self._plotter = self._newplotter()
             self._plotter.figmgr.casabar=self._newcasabar()
-        if self._plotter.figmgr.casabar:
+        if self.casabar_exists():
             self._plotter.figmgr.casabar.set_pagecounter(1)
         self._panelrows = []
@@ -121 +128 @@
         if self._minmaxy is not None:
             self._plotter.set_limits(ylim=self._minmaxy)
-        if self._plotter.figmgr.casabar: self._plotter.figmgr.casabar.enable_button()
+        if self.casabar_exists(): self._plotter.figmgr.casabar.enable_button()
         self._plotter.release()
         self._plotter.tidy()
@@ -1034 +1041 @@
         self._startrow = r+1
         self._ipanel += panelcount
-        if self._plotter.figmgr.casabar:
+        if self.casabar_exists():
             if self._ipanel >= nptot-1:
                 self._plotter.figmgr.casabar.disable_next()
@@ -1285 +1292 @@
     def plottp(self, scan=None, outfile=None):
         if self._plotter.is_dead:
-            if hasattr(self._plotter.figmgr,'casabar'):
+            if self.casabar_exists():
                 del self._plotter.figmgr.casabar
             self._plotter = self._newplotter()
@@ -1316 +1323 @@
         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()
+        if self.casabar_exists(): self._plotter.figmgr.casabar.disable_button()
         self._plottp(self._data)
         if self._minmaxy is not None: