Changeset 2715 for trunk/python

Timestamp:

01/07/13 19:29:32 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (minor improvements)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added a 'private' method, _subplotOk,

to check subplot layout in asaplotbase class.

Test Programs: do page iteration

Put in Release Notes: No

Module(s): asaplotbase, asapplotter, and sdplot

Description:

Implemented a better procedure to check if re-generation of
subplot instanses are necessary in page iteration.
Also, reset page counter when layout is changed by asapplotter.set_layout.

Location:

trunk/python

Files:

• asaplotbase.py (modified) (2 diffs)
• asapplotter.py (modified) (3 diffs)

trunk/python/asaplotbase.py

@@ -9 +9 @@
 from matplotlib.figure import Figure, Text
 from matplotlib.font_manager import FontProperties as FP
-from numpy import sqrt
+from numpy import sqrt, ceil
 from matplotlib import rc, rcParams
 from matplotlib.ticker import OldScalarFormatter
@@ -100 +100 @@
         return False
 
+    def _subplotsOk(self, rows, cols, npanel=0):
+        """
+        Check if the axes in subplots are actually the ones plotted on
+        the figure. Returns a bool.
+        This method is to detect manual layout changes using mpl methods.
+        """
+        # compare with user defined layout
+        if (rows is not None) and (rows != self.rows):
+            return False
+        if (cols is not None) and (cols != self.cols):
+            return False
+        # check number of subplots
+        figaxes = self.figure.get_axes()
+        np = self.rows*self.cols
+        if npanel > np:
+            return False
+        if len(figaxes) != np:
+            return False
+        if len(self.subplots) != len(figaxes):
+            return False
+        # compare axes instance in this class and on the plotter
+        ok = True
+        for ip in range(np):
+            if self.subplots[ip]['axes'] != figaxes[ip]:
+                ok = False
+                break
+        return ok
 
     ### Delete artists ###

trunk/python/asapplotter.py

@@ -517 +517 @@
         self._rows = rows
         self._cols = cols
+        # new layout is set. need to reset counters for multi page plotting
+        self._reset_counters()
         if refresh and self._data: self.plot(self._data)
         return
@@ -949 +951 @@
         self._startrow = 0
         self._ipanel = -1
+        self._panelrows = []
         self._reset_header()
-        self._panelrows = []
         if self.casabar_exists():
             self._plotter.figmgr.casabar.set_pagecounter(1)
@@ -1042 +1044 @@
         if self._panelling == 'i':
             ganged = False
-        if not firstpage:
-            # not the first page just clear the axis
+        if (not firstpage) and \
+               self._plotter._subplotsOk(self._rows, self._cols, n):
+            # Not the first page and subplot number is ok.
+            # Just clear the axis
             nx = self._plotter.cols
             ipaxx = n - nx - 1 #the max panel id to supress x-label