Changeset 2604 for trunk/python

Timestamp:

07/20/12 15:00:14 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (minor improvements)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit tests of sdplot

Put in Release Notes: No

Module(s): asapplotter, sdplot (CASA)

Description:

Eliminated duplication of codes.
A minor bug fix to asapplotter.plotgrid.
Initial attempt to add destructor to asapplotter class.

File:

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

trunk/python/asapplotter.py

@@ -78 +78 @@
         self._linestyles = None
         self._legendloc = None
+
+    def __del__(self):
+        print "Destructor of sd.plotter"
+        del self._data
+        if self._plotter: self._plotter.quit()
 
     def _translate(self, instr):
@@ -412 +417 @@
         from asap import scantable
         if isinstance(scan, scantable):
-            if self._data is not None:
-                if scan != self._data:
-                    del self._data
-                    self._data = scan
-                    # reset
-                    self._reset()
-                    msg = "A new scantable is set to the plotter. "\
-                          "The masks and data selections are reset."
-                    asaplog.push( msg )
-            else:
-                self._data = scan
-                self._reset()
+            if (self._data is not None) and (scan != self._data):
+                del self._data
+                msg = "A new scantable is set to the plotter. "\
+                      "The masks and data selections are reset."
+                asaplog.push( msg )
+            self._data = scan
+            # reset
+            self._reset()
         else:
             msg = "Input is not a scantable"
@@ -1615 +1616 @@
             msg = "No scantable is specified to plot"
             raise TypeError(msg)
-        if isinstance(scan, scantable):
-            if self._data is not None:
-                if scan != self._data:
-                    self._data = scan
-                    # reset
-                    self._reset()
-            else:
-                self._data = scan
-                self._reset()
-        elif not self._data:
-            msg = "Input is not a scantable"
-            raise TypeError(msg)
-        
+        if scan: 
+            self.set_data(scan, refresh=False)
+            del scan
+
         # Rows and cols
         if rows:
@@ -1750 +1742 @@
         self._plotter.hold()
         self._plotter.clear()
+        self._plotter.legend()
         
         # Adjust subplot margins