Changeset 1897 for trunk/python

Timestamp:

08/25/10 11:05:30 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #202: add offset keyword to asapplotter.set_range

File:

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

trunk/python/asapplotter.py

@@ -51 +51 @@
         self._fp = FontProperties()
         self._panellayout = self.set_panellayout(refresh=False)
+        self._offset = None
 
     def _translate(self, instr):
@@ -103 +104 @@
             msg = "Input is not a scantable"
             raise TypeError(msg)
-        if scan: self.set_data(scan,refresh=False)
+        if scan: 
+            self.set_data(scan, refresh=False)
         self._plot(self._data)
         if self._minmaxy is not None:
@@ -293 +295 @@
                     # reset
                     self._reset()
-                    msg = "A new scantable is set to the plotter. The masks and data selections are reset."
+                    msg = "A new scantable is set to the plotter. "\
+                          "The masks and data selections are reset."
                     asaplog.push( msg )
             else:
@@ -385 +388 @@
         return False
 
-    def set_range(self,xstart=None,xend=None,ystart=None,yend=None,refresh=True):
+    def set_range(self,xstart=None,xend=None,ystart=None,yend=None,refresh=True, offset=None):
         """
         Set the range of interest on the abcissa of the plot
@@ -393 +396 @@
                       replotted based on the new parameter setting(s).
                       Otherwise,the parameter(s) are set without replotting.
+            offset:   shift the abcissa by the given amount. The abcissa label will
+                      have '(relative)' appended to it.
         Note:
             These become non-sensical when the unit changes.
@@ -398 +403 @@
 
         """
+        self._offset = offset
         if xstart is None and xend is None:
             self._minmaxx = None
@@ -804 +810 @@
         self._usermask = []
         self._usermaskspectra = None
+        self._offset = None
         self.set_selection(None, False)
 
@@ -869 +876 @@
                 xlab = self._abcissa and self._abcissa[panelcount] \
                        or scan._getabcissalabel()
+                if self._offset and not self._abcissa:
+                    xlab += " (relative)"
                 ylab = self._ordinate and self._ordinate[panelcount] \
                        or scan._get_ordinate_label()
@@ -895 +904 @@
                     if d[self._stacking](r) in self._maskselection[self._stacking]:
                         m = logical_and(m, self._usermask)
-                x = scan._getabcissa(r)
                 from numpy import ma, array
+                x = array(scan._getabcissa(r))
+                if self._offset:
+                    x += self._offset
                 y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
                 if self._minmaxx is not None: