Changeset 620 for trunk

Timestamp:

05/05/05 12:20:27 (20 years ago)

Author:

mar637

Message:

various plotter fixes from Release-1

File:

• trunk/python/asaplot.py (modified) (11 diffs)

trunk/python/asaplot.py

@@ -65 +65 @@
         self.colours = [1, 'b', 'g', 'r', 'c', 'm', 'y', 'k']
         self.attributes = {}
-        self.loc = 1
+        self.loc = 0
 
         matplotlib.interactive = True
@@ -80 +80 @@
         for i in range(1,len(self.lines)+1):
            self.delete(i)
-
         self.axes.clear()
         self.colours[0] = 1
@@ -103 +102 @@
                         line.set_linestyle('None')
                         self.lines[number] = None
-
-        self.show()
-
+        self.show()        
 
     def get_line(self):
@@ -150 +147 @@
 
 
-    def legend(self, loc=1):
+    def legend(self, loc=None):
         """
         Add a legend to the plot.
@@ -167 +164 @@
 
         """
-        if 1 > loc > 10: loc = 0
-        self.loc = loc
+        if isinstance(loc,int):
+            if 0 > loc > 10: loc = 0
+            self.loc = loc
         self.show()
 
@@ -512 +510 @@
         ylim = [ymin, ymax] as in axes.set_ylim().
         """
-
         for s in self.subplots:
             self.axes  = s['axes']
             self.lines = s['lines']
-            if xlim is not None:
-                self.axes.set_xlim(xlim)
-            if ylim is not None:
-                self.axes.set_ylim(ylim)
-        return
+            oldxlim =  list(self.axes.get_xlim())
+            oldylim =  list(self.axes.get_ylim())
+            if xlim is not None:
+                for i in range(len(xlim)):
+                    if xlim[i] is not None:
+                        oldxlim[i] = xlim[i]
+            if ylim is not None:                        
+                for i in range(len(ylim)):
+                    if ylim[i] is not None:
+                        oldylim[i] = ylim[i]
+            self.axes.set_xlim(oldxlim)
+            self.axes.set_ylim(oldylim)
+        return
 
 
@@ -568 +573 @@
 
 
-    def set_panels(self, rows=1, cols=0, n=-1, nplots=-1):
+    def set_panels(self, rows=1, cols=0, n=-1, nplots=-1, ganged=True):
         """
         Set the panel layout.
@@ -626 +631 @@
                                                 cols, i+1)
                 self.subplots[i]['lines'] = []
-
-                if rows > 1 or cols > 1:
-                    # Squeeze the plots together.
-                    pos = self.subplots[i]['axes'].get_position()
-                    if cols > 1: pos[2] *= 1.1
-                    if rows > 1: pos[3] *= 1.1
-                    self.subplots[i]['axes'].set_position(pos)
-
-                # Suppress tick labelling for interior subplots.
-                if i <= (rows-1)*cols - 1:
-                    # Suppress x-labels for frames not in the bottom row.
-                    for tick in self.subplots[i]['axes'].xaxis.majorTicks:
-                        tick.label1On = False
-
-                if i%cols:
-                    # Suppress y-labels for frames not in the left column.
-                    for tick in self.subplots[i]['axes'].yaxis.majorTicks:
-                        tick.label1On = False
+                xfsize = self.subplots[i]['axes'].xaxis.label.get_size()-cols/2
+                yfsize = self.subplots[i]['axes'].yaxis.label.get_size()-rows/2
+                self.subplots[i]['axes'].xaxis.label.set_size(xfsize)
+                self.subplots[i]['axes'].yaxis.label.set_size(yfsize)
+                
+                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:
+                        if i+cols < nplots:
+                            # Suppress x-labels for frames width
+                            # adjacent frames
+                            for tick in \
+                                    self.subplots[i]['axes'].xaxis.majorTicks:
+                                tick.label1On = False
+                                self.subplots[i]['axes'].xaxis.label.set_visible(False)
+                    if i%cols:
+                        # Suppress y-labels for frames not in the left column.
+                        for tick in self.subplots[i]['axes'].yaxis.majorTicks:
+                            tick.label1On = False
+                        self.subplots[i]['axes'].yaxis.label.set_visible(False)
+                        
 
                 self.rows = rows
@@ -650 +665 @@
             self.subplot(0)
 
-
     def set_title(self, title=None):
         """
@@ -667 +681 @@
         """
         if not self.buffering:
-            if self.loc:
+            if self.loc is not None:
                 for j in range(len(self.subplots)):
                     lines  = []
@@ -691 +705 @@
             self.canvas.show()
 
-
     def subplot(self, i=None, inc=None):
         """