Some small tweaks to the code for Plot and PlotLayout.

Author: alexras

Plot.py

@@ -347,7 +347,12 @@ def save(self, filename, **kwargs):
         layout.save(filename,**kwargs)
 
     def subplot(self, fig, row, column, position, projection):
-        ax = fig.add_subplot(row, column, position, projection=projection)
+        kwdict = {}
+
+        if projection is not None:
+            kwdict["projection"] = projection
+
+        ax = fig.add_subplot(row, column, position, **kwdict)
         return self.drawPlot(fig, ax)
 
     def drawPlot(self, fig, ax):

PlotLayout.py

@@ -182,8 +182,9 @@ def _doPlot(self):
                 myCols = numPlots
                 myPos = (currentRow * numPlots) + currentColumn
 
-                (currPlotHandles, currPlotLabels) = plot.subplot(
-                    fig, myRows, myCols, myPos, projection=plot.projection)
+                (currPlotHandles, currPlotLabels) = self._plot_subplot(
+                    plot = plot, fig = fig, rows = myRows, cols = myCols,
+                    pos = myPos, projection=plot.projection)
 
                 for i in xrange(len(currPlotHandles)):
                     if currPlotLabels[i] in plotLabels:
@@ -196,9 +197,6 @@ def _doPlot(self):
 
                     plotLabels.append(currPlotLabels[i])
 
-#                plotHandles.extend(currPlotHandles)
-#                plotLabels.extend(currPlotLabels)
-
                 currentColumn += 1
             currentRow += 1
 
@@ -214,8 +212,10 @@ def _doPlot(self):
                 myCols = numColumns
                 myPos = (currentRow * numColumns) + currentColumn
 
-                (currPlotHandles, currPlotLabels) = plot.subplot(
-                    fig, myRows, myCols, myPos, projection=plot.projection)
+                (currPlotHandles, currPlotLabels) = self._plot_subplot(
+                    plot = plot, fig = fig, rows = myRows, cols = myCols,
+                    pos = myPos, projection=plot.projection)
+
                 for i in xrange(len(currPlotHandles)):
                     if currPlotLabels[i] in plotLabels:
                         continue
@@ -239,11 +239,7 @@ def _doPlot(self):
             figLegendKeywords = {}
 
             if self.figLegendCols is not None:
-                versionPieces = [int(x) for x in matplotlib.__version__.split('.')]
-
-                (superMajor, major, minor) = versionPieces[0:3]
-
-                if superMajor == 0 and major < 98:
+                if not self._check_min_matplotlib_version((0, 98, 0)):
                     warnings.warn("Number of columns support not available in "
                                   "versions of matplotlib prior to 0.98")
                 else:
@@ -266,6 +262,18 @@ def _doPlot(self):
 
         return fig
 
+    def _plot_subplot(self, plot, fig, rows, cols, pos, projection):
+        return plot.subplot(fig, rows, cols, pos, projection)
+
+    def _check_min_matplotlib_version(self, version):
+        versionPieces = [int(x) for x in matplotlib.__version__.split('.')]
+
+        (superMajor, major, minor) = versionPieces[0:3]
+
+        minVersionSatisfied = (superMajor >= version[0] and major >= version[1]
+                               and minor >= version[2])
+        return minVersionSatisfied
+
     def plot(self):
         fig = self._doPlot()
         if not pylab.isinteractive():