Merge pull request #194 from benneti/master

add option to turn the axis environment of

Author: nschloe

matplotlib2tikz/save.py

@@ -28,6 +28,7 @@ def get_tikz_code(
         tex_relative_path_to_data=None,
         strict=False,
         wrap=True,
+        axis_environment=True,
         extra_axis_parameters=None,
         extra_tikzpicture_parameters=None,
         dpi=None,
@@ -84,6 +85,12 @@ def get_tikz_code(
                  Default is ``True``.
     :type wrap: bool
 
+    :param axis_environment: Whether ``'\\begin{axis}[...]'`` and
+                             ``'\\end{axis}'`` will be written. One needs to
+                             set the environment in the document. If ``False``
+                             additionally sets ``wrap=False``.
+    :type axis_environment: bool
+
     :param extra_axis_parameters: Extra axis options to be passed (as a set)
                                     to pgfplots. Default is ``None``.
     :type extra_axis_parameters: a set of strings for the pfgplots axes.
@@ -126,6 +133,8 @@ def get_tikz_code(
     data['custom colors'] = {}
     data['legend colors'] = []
     data['extra tikzpicture parameters'] = extra_tikzpicture_parameters
+    data['axis environment'] = axis_environment
+    data['show_info'] = show_info
     # rectangle_legends is used to keep track of which rectangles have already
     # had \addlegendimage added. There should be only one \addlegenimage per
     # bar chart data series.
@@ -143,6 +152,10 @@ def get_tikz_code(
             savefig_dpi if isinstance(savefig_dpi, int) \
             else mpl.rcParams['figure.dpi']
 
+    # print message about necessary pgfplot libs to command line
+    if show_info:
+        _print_pgfplot_libs_message(data)
+
     # gather the file content
     data, content = _recurse(data, figure)
 
@@ -158,7 +171,7 @@ def get_tikz_code(
     code += _tex_comment(disclaimer)
 
     # write the contents
-    if wrap:
+    if wrap and axis_environment:
         code += '\\begin{tikzpicture}\n\n'
         if extra_tikzpicture_parameters:
             code += ',\n'.join(data['extra tikzpicture parameters'])
@@ -171,12 +184,9 @@ def get_tikz_code(
 
     code += ''.join(content)
 
-    if wrap:
+    if wrap and axis_environment:
         code += '\\end{tikzpicture}'
 
-    # print message about necessary pgfplot libs to command line
-    if show_info:
-        _print_pgfplot_libs_message(data)
     return code
 
 
@@ -275,11 +285,20 @@ def _recurse(data, obj):
                 # 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() +
-                        children_content +
-                        [ax.get_end_code(data)], 0)
+                # populate content and add axis environment if wished
+                if data['axis environment']:
+                    content.extend(
+                            ax.get_begin_code() +
+                            children_content +
+                            [ax.get_end_code(data)], 0)
+                else:
+                    content.extend(children_content, 0)
+                    # print axis environment options, if told to show infos
+                    if data['show_info']:
+                        print("=========================================================")
+                        print("These would have been the properties of the environment:")
+                        print(''.join(ax.get_begin_code()[1:]))
+                        print("=========================================================")
         elif isinstance(child, mpl.lines.Line2D):
             data, cont = line2d.draw_line2d(data, child)
             content.extend(cont, child.get_zorder())