Changeset 1553 for trunk/python

Timestamp:

03/30/09 11:00:13 (16 years ago)

Author:

Malte Marquarding

Message:

Fix for Ticket #157; numpy api changed for mask/data access in MaskedArray

File:

• trunk/python/asaplotbase.py (modified) (3 diffs)

trunk/python/asaplotbase.py

@@ -155 +155 @@
         from matplotlib.numerix import array
         from matplotlib.numerix.ma import MaskedArray
+        
         if x is None:
             if y is None: return
@@ -166 +167 @@
         y2 = range(l2)
         m2 = range(l2)
-        ymsk = y.raw_mask()
-        ydat = y.raw_data()
+        ymsk = None
+        ydat = None
+        if hasattr(y, "raw_mask"):
+            # numpy < 1.1
+            ymsk = y.raw_mask()
+            ydat = y.raw_data()
+        else:
+            ymsk = y.mask
+            ydat = y.data
+
         for i in range(l2):
             x2[i] = x[i/2]
@@ -289 +298 @@
     def get_point(self):
         print "Please select the point" 
-        return self.figure.ginput(n=1, show_clicks=False)[0]
+        pt = self.figure.ginput(n=1, show_clicks=False)
+        if pt:
+            return pt[0]
+        else:
+            return None
 
     def region(self):