Changeset 1025 for trunk/python

Timestamp:

04/20/06 16:47:00 (19 years ago)

Author:

mar637

Message:

a stab at making axis ticks and labels scale in multipanelling. Reverted the version depend save addition.

File:

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

trunk/python/asaplotbase.py

@@ -13 +13 @@
 from matplotlib import rc, rcParams
 from asap import rcParams as asaprcParams
-
 from matplotlib.ticker import ScalarFormatter
 from matplotlib.ticker import NullLocator
@@ -19 +18 @@
 class MyFormatter(ScalarFormatter):
     def __call__(self, x, pos=None):
-        last = len(self.locs)-2
-        if pos==last:
-            print "Diabling tick no " , pos, last
-            return ''  # pos=-1 is the last tick
+        #last = len(self.locs)-2
+        if pos==0:
+            return ''
         else: return ScalarFormatter.__call__(self, x, pos)
 
@@ -206 +204 @@
         The argument list works a bit like the matlab plot() function.
         """
-
         if x is None:
             if y is None: return
@@ -215 +212 @@
             x = range(len(y))
 
+        ax = self.axes
+        s = ax.title.get_size()
+        tsize = s-(self.cols+self.rows)/2
+        ax.title.set_size(tsize)
+        origx = rcParams['xtick.labelsize']
+        origy = rcParams['ytick.labelsize']
+        if self.cols > 1:
+            xfsize = origx-(self.cols)/2
+            #rc('xtick',labelsize=xfsize)
+            ax.xaxis.label.set_size(xfsize)
+        if self.rows > 1:
+            yfsize = origy-(self.rows)/2
+            #rc('ytick',labelsize=yfsize)
+            ax.yaxis.label.set_size(yfsize)
         if mask is None:
             if fmt is None:
@@ -238 +249 @@
 
             line = self.axes.plot(*segments)
+        #rc('xtick',labelsize=origx)
+        #rc('ytick',labelsize=origy)
+
         # Add to an existing line?
         if add is None or len(self.lines) < add < 0:
@@ -425 +439 @@
                         else:
                             orientation = 'portrait'
-                    # hack to circument ps bug in eraly versions of mpl
-                    if int(mv.split(".")[1]) < 86:
-                        a4w = 8.25
-                        a4h = 11.25
-                        ds = None
-                        if orientation == 'landscape':
-                            ds = min(a4h/w,a4w/h)
-                        else:
-                            ds = min(a4w/w,a4h/h)
-                        ow = ds * w
-                        oh = ds * h
-                        self.figure.set_figsize_inches((ow,oh))
-                    self.canvas.print_figure(fname,orientation=orientation)
+                    a4w = 8.25
+                    a4h = 11.25
+                    ds = None
+                    if orientation == 'landscape':
+                        ds = min(a4h/w,a4w/h)
+                    else:
+                        ds = min(a4w/w,a4h/h)
+                    ow = ds * w
+                    oh = ds * h
+                    self.figure.set_figsize_inches((ow,oh))
+                    self.figure.savefig(fname, orientation=orientation,
+                                        papertype="a4")
+                    # reset the figure size
+                    self.figure.set_figsize_inches((w,h))
                     print 'Written file %s' % (fname)
                 else:
                     if dpi is None:
                         dpi =150
-                    self.canvas.print_figure(fname,dpi=dpi)
+                    self.figure.savefig(fname,dpi=dpi)
                     print 'Written file %s' % (fname)
             except IOError, msg:
@@ -470 +485 @@
 
         getattr(self.axes, "set_%s"%what)(*args, **newargs)
-        s = self.axes.title.get_size()
-        tsize = s-(self.cols+self.rows)/2-1
-        self.axes.title.set_size(tsize)
-        if self.cols > 1:
-            xfsize = self.axes.xaxis.label.get_size()-(self.cols+1)/2
-            self.axes.xaxis.label.set_size(xfsize)
-        if self.rows > 1:
-            yfsize = self.axes.yaxis.label.get_size()-(self.rows+1)/2
-            self.axes.yaxis.label.set_size(yfsize)
 
         self.show()
@@ -623 +629 @@
             if nplots < 1 or rows*cols < nplots:
                 nplots = rows*cols
-
+            if ganged:
+                hsp,wsp = None,None
+                if rows > 1: hsp = 0.0001
+                if cols > 1: wsp = 0.0001
+                self.figure.subplots_adjust(wspace=wsp,hspace=hsp)
             for i in range(nplots):
                 self.subplots.append({})
-
-                self.subplots[i]['axes']  = self.figure.add_subplot(rows,
+                self.subplots[i]['axes'] = self.figure.add_subplot(rows,
                                                 cols, i+1)
                 self.subplots[i]['lines'] = []
 
                 if ganged:
-                    if rows > 1 or cols > 1:
-                        # Squeeze the plots together.
-                        pos = self.subplots[i]['axes'].get_position()
-                        if cols > 1: pos[2] *= 1.2
-                        if rows > 1: pos[3] *= 1.2
-                        self.subplots[i]['axes'].set_position(pos)
-
                     # Suppress tick labelling for interior subplots.
                     if i <= (rows-1)*cols - 1:
@@ -651 +653 @@
                             tick.label1On = False
                         self.subplots[i]['axes'].yaxis.label.set_visible(False)
-                    if (i+1)%cols:
+                    # disable the first tick of [1:ncol-1] of the last row
+                    if (nplots-cols) < i <= nplots-1:
                         self.subplots[i]['axes'].xaxis.set_major_formatter(MyFormatter())
                 self.rows = rows
                 self.cols = cols
-
             self.subplot(0)