Changeset 1798 for branches/newfiller/python/asapplotter.py

Timestamp:

08/02/10 10:51:45 (14 years ago)

Author:

Malte Marquarding

Message:

merge -r1774:1797 from alma to newfiller

Location:

branches/newfiller

Files:

• . (modified) (1 prop)
• python/asapplotter.py (modified) (9 diffs)

branches/newfiller/python/asapplotter.py

@@ -77 +77 @@
         else: return None
 
-    #@print_log_dec
+    @print_log_dec
     def plot(self, scan=None):
         """
@@ -180 +180 @@
     def text(self, *args, **kwargs):
         if kwargs.has_key("interactive"):
-            #if kwargs.pop("interactive"):
-            #    pos = self._plotter.get_point()
-            #    args = tuple(pos)+args
-            kwargs.pop("interactive")
+            if kwargs.pop("interactive"):
+                pos = self._plotter.get_point()
+                args = tuple(pos)+args
         self._axes_callback("text", *args, **kwargs)
 
@@ -190 +189 @@
     def arrow(self, *args, **kwargs):
         if kwargs.has_key("interactive"):
-            #if kwargs.pop("interactive"):
-            #    pos = self._plotter.get_region()
-            #    dpos = (pos[0][0], pos[0][1],
-            #            pos[1][0]-pos[0][0],
-            #            pos[1][1] - pos[0][1])
-            #    args = dpos + args
-            kwargs.pop("interactive")
+            if kwargs.pop("interactive"):
+                pos = self._plotter.get_region()
+                dpos = (pos[0][0], pos[0][1],
+                        pos[1][0]-pos[0][0],
+                        pos[1][1] - pos[0][1])
+                args = dpos + args
         self._axes_callback("arrow", *args, **kwargs)
 
@@ -203 +201 @@
     def annotate(self, text, xy=None, xytext=None, **kwargs):
         if kwargs.has_key("interactive"):
-            #if kwargs.pop("interactive"):
-            #    xy = self._plotter.get_point()
-            #    xytext = self._plotter.get_point()
-            kwargs.pop("interactive")
+            if kwargs.pop("interactive"):
+                xy = self._plotter.get_point()
+                xytext = self._plotter.get_point()
         if not kwargs.has_key("arrowprops"):
             kwargs["arrowprops"] = dict(arrowstyle="->")
@@ -215 +212 @@
     def axvline(self, *args, **kwargs):
         if kwargs.has_key("interactive"):
-            #if kwargs.pop("interactive"):
-            #    pos = self._plotter.get_point()
-            #    args = (pos[0],)+args
-            kwargs.pop("interactive")
+            if kwargs.pop("interactive"):
+                pos = self._plotter.get_point()
+                args = (pos[0],)+args
         self._axes_callback("axvline", *args, **kwargs)
 
@@ -225 +221 @@
     def axhline(self, *args, **kwargs):
         if kwargs.has_key("interactive"):
-            #if kwargs.pop("interactive"):
-            #    pos = self._plotter.get_point()
-            #    args = (pos[1],)+args
-            kwargs.pop("interactive")
+            if kwargs.pop("interactive"):
+                pos = self._plotter.get_point()
+                args = (pos[1],)+args
         self._axes_callback("axhline", *args, **kwargs)
 
@@ -235 +230 @@
     def axvspan(self, *args, **kwargs):
         if kwargs.has_key("interactive"):
-            #if kwargs.pop("interactive"):
-            #    pos = self._plotter.get_region()
-            #    dpos = (pos[0][0], pos[1][0])
-            #    args = dpos + args
-            kwargs.pop("interactive")
+            if kwargs.pop("interactive"):
+                pos = self._plotter.get_region()
+                dpos = (pos[0][0], pos[1][0])
+                args = dpos + args
         self._axes_callback("axvspan", *args, **kwargs)
         # hack to preventy mpl from redrawing the patch
@@ -250 +244 @@
     def axhspan(self, *args, **kwargs):
         if kwargs.has_key("interactive"):
-            #if kwargs.pop("interactive"):
-            #    pos = self._plotter.get_region()
-            #    dpos = (pos[0][1], pos[1][1])
-            #    args = dpos + args
-            kwargs.pop("interactive")
+            if kwargs.pop("interactive"):
+                pos = self._plotter.get_region()
+                dpos = (pos[0][1], pos[1][1])
+                args = dpos + args
         self._axes_callback("axhspan", *args, **kwargs)
         # hack to preventy mpl from redrawing the patch
@@ -1220 +1213 @@
         private method for plotting total power data
         """
-        from matplotlib.numerix import ma, array, arange, logical_not
+        from numpy import ma, array, arange, logical_not
         r=0
         nr = scan.nrow()