Changeset 2714 for trunk

Timestamp:

01/07/13 17:26:45 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (a minor fix)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit tests of sdplot

Put in Release Notes: No

Module(s): asapplotter and sdplot

Description: more resetting when new scantable is set to plot.

File:

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

trunk/python/asapplotter.py

@@ -112 +112 @@
         self._plotter.legend(self._legendloc)
 
+    ### TODO: it's probably better to define following two methods in
+    ###       backend dependent class.
     def _new_custombar(self):
         backend=matplotlib.get_backend()
@@ -130 +132 @@
             return True
         return False
+    ### end of TODO
 
     def _assert_plotter(self,action="status",errmsg=None):
@@ -276 +279 @@
 
 
-    ### Forwards to matplotlib axes ###
+    ### Forwards to methods in matplotlib axes ###
     def text(self, *args, **kwargs):
         self._assert_plotter(action="reload")
@@ -415 +418 @@
                 del self._data
                 msg = "A new scantable is set to the plotter. "\
-                      "The masks and data selections are reset."
-                asaplog.push( msg )
+                      "The masks, data selections, and labels are reset."
+                asaplog.push(msg)
             self._data = scan
             # reset
@@ -905 +908 @@
             msg = "Can only set mask after a first call to plot()"
             raise RuntimeError(msg)
-        if len(mask):
+        if (mask is not None) and len(mask):
             if isinstance(mask, list) or isinstance(mask, tuple):
                 self._usermask = array(mask)
@@ -926 +929 @@
     ### Reset methods ###
     def _reset(self):
-        self._usermask = []
-        self._usermaskspectra = None
+        """Reset method called when new data is set"""
+        # reset selections and masks
+        self.set_selection(None, False)
+        self.set_mask(None, None, False)
+        # reset offset
         self._offset = None
-        self.set_selection(None, False)
+        # reset header
         self._reset_header()
+        # reset labels
+        self._lmap = None # related to stack
+        self.set_title(None, None, False)
+        self.set_ordinate(None, None, False)
+        self.set_abcissa(None, None, False)
 
     def _reset_header(self):