Merge pull request #125 from nschloe/open-groupplot

Open groupplot

Author: nschloe

matplotlib2tikz/__init__.py

@@ -8,7 +8,7 @@
 __copyright__ = 'Copyright (c) 2010-2016, %s <%s>' % (__author__, __email__)
 __credits__ = []
 __license__ = 'MIT License'
-__version__ = '0.5.15'
+__version__ = '0.5.16'
 __maintainer__ = 'Nico Schlömer'
 __status__ = 'Production'
 

matplotlib2tikz/axes.py

@@ -41,11 +41,13 @@ def __init__(self, data, obj):
                     self.is_subplot = True
                     # subplotspec geometry positioning is 0-based
                     self.subplot_index = geom[2] + 1
-                    if self.subplot_index == 1:
+                    if 'is_in_groupplot_env' not in data \
+                      or not data['is_in_groupplot_env']:
                         self.content.append(
                             '\\begin{groupplot}[group style='
                             '{group size=%.d by %.d}]\n' % (geom[1], geom[0])
                             )
+                        data['is_in_groupplot_env'] = True
                         data['pgfplots libs'].add('groupplots')
 
         self.axis_options = []
@@ -358,10 +360,11 @@ def get_begin_code(self):
             content.append('[\n' + ',\n'.join(self.axis_options) + '\n]\n')
         return content
 
-    def get_end_code(self):
+    def get_end_code(self, data):
         if not self.is_subplot:
             return '\\end{axis}\n\n'
         elif self.is_subplot and self.nsubplots == self.subplot_index:
+            data['is_in_groupplot_env'] = False
             return '\\end{groupplot}\n\n'
         else:
             return ''

matplotlib2tikz/save.py

@@ -145,6 +145,11 @@ def save(filepath,
     # gather the file content
     data, content = _recurse(data, figure)
 
+    # Check if there is still an open groupplot environment. This occurs if not
+    # all of the group plot slots are used.
+    if 'is_in_groupplot_env' in data and data['is_in_groupplot_env']:
+        content.extend('\\end{groupplot}\n\n')
+
     disclaimer = 'This file was created by matplotlib2tikz v%s.' % __version__
 
     # write disclaimer to the file header
@@ -225,15 +230,15 @@ def _recurse(data, obj):
 
             ax = axes.Axes(data, child)
             if not ax.is_colorbar:
-                # Run through the children objects, gather the content.
+                # Run through the child objects, gather the content.
                 data, children_content = _recurse(data, child)
                 # add extra axis options from children
                 if data['extra axis options']:
                     ax.axis_options.extend(data['extra axis options'])
                 # populate content
                 content.extend(ax.get_begin_code())
                 content.extend(children_content)
-                content.extend(ax.get_end_code())
+                content.extend(ax.get_end_code(data))
         elif isinstance(child, mpl.lines.Line2D):
             data, cont = line2d.draw_line2d(data, child)
             content.extend(cont)