Changeset 1095 for trunk/python

Timestamp:

07/31/06 12:18:37 (18 years ago)

Author:

mar637

Message:

moved mpl version check to class import. It prints warning now. No more support for mpl <0.87 in ps output (see Ticket #34). added asap rcparam plotter.papertype as wrapper for mpl ps.papertype

File:

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

trunk/python/asaplotbase.py

@@ -15 +15 @@
 from matplotlib.ticker import ScalarFormatter
 from matplotlib.ticker import NullLocator
+if int(matplotlib.__version__.split(".")[1]) < 87:
+    print "Warning: matplotlib version < 0.87. This might cause errors. Please upgrade."
 
 class MyFormatter(ScalarFormatter):
@@ -194 +196 @@
 
         """
-        if isinstance(loc,int):
-            if 0 > loc > 10: loc = 0
+        if isinstance(loc, int):
+            if 0 >= loc > 10: loc = None
             self.loc = loc
-        self.show()
+        else:
+            self.loc = None
+        #self.show()
 
 
@@ -376 +380 @@
 
 
-    def save(self, fname=None, orientation=None, dpi=None):
+    def save(self, fname=None, orientation=None, dpi=None, papertype=None):
         """
         Save the plot to a file.
@@ -385 +389 @@
         directory.
         """
+        from asap import rcParams
+        if papertype is None:
+            papertype = rcParams['plotter.papertype']
         if fname is None:
             from datetime import datetime
@@ -408 +415 @@
                         else:
                             orientation = 'portrait'
-                    a4w = 8.25
-                    a4h = 11.25
+                    from matplotlib.backends.backend_ps import papersize
+                    pw,ph = papersize[papertype.lower()]
                     ds = None
                     if orientation == 'landscape':
-                        ds = min(a4h/w,a4w/h)
+                        ds = min(ph/w, pw/h)
                     else:
-                        ds = min(a4w/w,a4h/h)
+                        ds = min(pw/w, ph/h)
                     ow = ds * w
                     oh = ds * h
-                    self.figure.set_figsize_inches((ow,oh))
-                    from matplotlib import __version__ as mv
-                    # hack to circument ps bug in eraly versions of mpl
-                    if int(mv.split(".")[1]) < 87:
-                        self.figure.savefig(fname, orientation=orientation)
-                    else:
-                        self.figure.savefig(fname, orientation=orientation,
-                                            papertype="a4")
-                    self.figure.set_figsize_inches((w,h))
+                    self.figure.set_figsize_inches((ow, oh))
+                    self.figure.savefig(fname, orientation=orientation,
+                                        papertype=papertype.lower())
+                    self.figure.set_figsize_inches((w, h))
                     print 'Written file %s' % (fname)
                 else:
@@ -667 +669 @@
 ##                         lsiz = rcParams['legend.fontsize']-len(lines)/2
                         sp['axes'].legend(tuple(lines), tuple(labels),
-                                          self.loc) 
+                                          self.loc)
 ##                                           ,prop=FontProperties(size=lsiz) )
                     else:
                         sp['axes'].legend((' '))
 
-            ax = sp['axes']
             from matplotlib.artist import setp
             xts = rcParams['xtick.labelsize']-(self.cols)/2