Changeset 1603 for branches/alma/python/asaplotbase.py

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

• branches/alma/python/asaplotbase.py (modified) (8 diffs)

branches/alma/python/asaplotbase.py

@@ -15 +15 @@
 from matplotlib.ticker import OldScalarFormatter
 from matplotlib.ticker import NullLocator
-from matplotlib.transforms import blend_xy_sep_transform
+
+# API change in mpl >= 0.98
+try:
+    from matplotlib.transforms import blended_transform_factory
+except ImportError:
+    from matplotlib.transforms import blend_xy_sep_transform  as blended_transform_factory
 
 if int(matplotlib.__version__.split(".")[1]) < 87:
@@ -161 +166 @@
         y2 = range(l2)
         m2 = range(l2)
-        #ymsk = y.raw_mask()
-        #ydat = y.raw_data()
-        ymsk = y.mask
-        ydat = y.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]
@@ -410 +420 @@
                 if fname[-3:].lower() == ".ps":
                     from matplotlib import __version__ as mv
-                    w = self.figure.figwidth.get()
-                    h = self.figure.figheight.get()
+                    w = self.figure.get_figwidth()
+                    h = self.figure.get_figheight()
 
                     if orientation is None:
@@ -428 +438 @@
                     ow = ds * w
                     oh = ds * h
-                    self.figure.set_figsize_inches((ow, oh))
+                    self.figure.set_size_inches((ow, oh))
                     self.figure.savefig(fname, orientation=orientation,
                                         papertype=papertype.lower())
-                    self.figure.set_figsize_inches((w, h))
+                    self.figure.set_size_inches((w, h))
                     print 'Written file %s' % (fname)
                 else:
@@ -617 +627 @@
                     self.subplots[i]['axes'] = self.figure.add_subplot(rows,
                                                 cols, i+1)
-                    self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
+                    if asaprcParams['plotter.xaxisformatting'] == 'mpl':
+                        self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
                 else:
                     if i == 0:
                         self.subplots[i]['axes'] = self.figure.add_subplot(rows,
                                                 cols, i+1)
-                        self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
+                        if asaprcParams['plotter.xaxisformatting'] != 'mpl':
+                            
+                            self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
                     else:
                         self.subplots[i]['axes'] = self.figure.add_subplot(rows,
@@ -709 +722 @@
             for sp in self.subplots:
                 ax = sp['axes']
-                s = rcParams['axes.titlesize']
-                tsize = s-(self.cols+self.rows-1)
-                ax.title.set_size(max(tsize,9))
+                s = ax.title.get_size()
+                tsize = s-(self.cols+self.rows)
+                ax.title.set_size(tsize)
                 fp = FP(size=rcParams['axes.labelsize'])
                 setp(ax.get_xticklabels(), fontsize=xts)
@@ -770 +783 @@
         if rotate > 0.0: lbloffset = 0.03*len(label)
         peakoffset = 0.01
-        xy0 = ax.transData.xy_tup((x,y))
-        # get relative coords
-        xy = ax.transAxes.inverse_xy_tup(xy0)
+        xy = None
+        xy0 = None
+        # matplotlib api change 0.98 is using transform now
+        if hasattr(ax.transData, "inverse_xy_tup"):
+            # get relative coords
+            xy0 = ax.transData.xy_tup((x,y))
+            xy = ax.transAxes.inverse_xy_tup(xy0)
+        else:
+            xy0 = ax.transData.transform((x,y))
+            # get relative coords
+            xy = ax.transAxes.inverted().transform(xy0)
         if location.lower() == 'top':
             ymax = 1.0-lbloffset
@@ -783 +804 @@
             valign = 'top'
             ylbl = ymin-0.01
-        trans = blend_xy_sep_transform(ax.transData, ax.transAxes)
+        trans = blended_transform_factory(ax.transData, ax.transAxes)
         l = ax.axvline(x, ymin, ymax, color='black', **kwargs)
         t = ax.text(x, ylbl ,label, verticalalignment=valign,