Merge pull request #501 from nschloe/more-externalize

More externalize

Author: nschloe

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tikzplotlib
-version = 0.9.10
+version = 0.9.11
 author = Nico Schlömer
 author_email = [email protected]
 description = Convert matplotlib figures into TikZ/PGFPlots

src/tikzplotlib/_line2d.py

@@ -201,13 +201,12 @@ def _table(obj, data):  # noqa: C901
 
     if isinstance(xdata_alt[0], datetime.datetime):
         xdata = xdata_alt
-    elif isinstance(xdata_alt[0], str):
-        data["current axes"].axis_options += [
-            "xtick={{{}}}".format(",".join([f"{x:{ff}}" for x in xdata])),
-            "xticklabels={{{}}}".format(",".join(xdata_alt)),
-        ]
-        xdata, ydata = transform_to_data_coordinates(obj, xdata, ydata)
     else:
+        if isinstance(xdata_alt[0], str):
+            data["current axes"].axis_options += [
+                "xtick={{{}}}".format(",".join([f"{x:{ff}}" for x in xdata])),
+                "xticklabels={{{}}}".format(",".join(xdata_alt)),
+            ]
         xdata, ydata = transform_to_data_coordinates(obj, xdata, ydata)
 
     # matplotlib allows plotting of data containing `astropy.units`, but they will break
@@ -252,12 +251,9 @@ def _table(obj, data):  # noqa: C901
             if not option.startswith("xmin")
         ]
         xmin, xmax = data["current mpl axes obj"].get_xlim()
-        data["current axes"].axis_options.append(
-            "xmin={}, xmax={}".format(
-                num2date(xmin).strftime("%Y-%m-%d %H:%M"),
-                num2date(xmax).strftime("%Y-%m-%d %H:%M"),
-            )
-        )
+        mindate = num2date(xmin).strftime("%Y-%m-%d %H:%M")
+        maxdate = num2date(xmax).strftime("%Y-%m-%d %H:%M")
+        data["current axes"].axis_options.append(f"xmin={mindate}, xmax={maxdate}")
     else:
         opts = []
         xformat = ff
@@ -267,7 +263,7 @@ def _table(obj, data):  # noqa: C901
         # don't want the \n in the table definition, just in the data (below)
         opts.append("row sep=" + data["table_row_sep"].strip())
 
-    if data["externals search path"] is not None:
+    if data["externalize tables"] and data["externals search path"] is not None:
         esp = data["externals search path"]
         opts.append(f"search path={{{esp}}}")
 
@@ -280,9 +276,10 @@ def _table(obj, data):  # noqa: C901
     plot_table = []
     table_row_sep = data["table_row_sep"]
     ydata[ydata_mask] = np.nan
-    if any(ydata_mask) or (~np.isfinite(ydata)).any():
-        # matplotlib jumps at masked or nan values, while PGFPlots by default interpolates.
-        # Hence, if we have a masked plot, make sure that PGFPlots jumps as well.
+    if np.any(ydata_mask) or ~np.all(np.isfinite(ydata)):
+        # matplotlib jumps at masked or nan values, while PGFPlots by default
+        # interpolates. Hence, if we have a masked plot, make sure that PGFPlots jumps
+        # as well.
         if "unbounded coords=jump" not in data["current axes"].axis_options:
             data["current axes"].axis_options.append("unbounded coords=jump")
 

src/tikzplotlib/_path.py

@@ -3,7 +3,7 @@
 from matplotlib.dates import DateConverter, num2date
 from matplotlib.markers import MarkerStyle
 
-from . import _color
+from . import _color, _files
 from ._axes import _mpl_cmap2pgf_cmap
 from ._hatches import _mpl_hatch2pgfp_pattern
 from ._markers import _mpl_marker2pgfp_marker
@@ -291,13 +291,31 @@ def draw_pathcollection(data, obj):
         do = f" [{j0}{{}}{j2}]".format(j1.join(draw_options)) if draw_options else ""
         content.append(f"\\addplot{do}\n")
 
-        to = " [{}]".format(", ".join(table_options)) if table_options else ""
-        content.append(f"table{to}{{%\n")
+        if data["externals search path"] is not None:
+            esp = data["externals search path"]
+            table_options.append(f"search path={{{esp}}}")
 
-        content.append("  ".join(labels) + "\n")
+        if len(table_options) > 0:
+            table_options_str = ", ".join(table_options)
+            content.append(f"table [{table_options_str}]{{")
+        else:
+            content.append("table{")
 
+        plot_table = []
+        plot_table.append("  ".join(labels) + "\n")
         for row in dd_strings:
-            content.append(" ".join(row) + "\n")
+            plot_table.append(" ".join(row) + "\n")
+
+        if data["externalize tables"]:
+            filepath, rel_filepath = _files.new_filepath(data, "table", ".dat")
+            with open(filepath, "w") as f:
+                # No encoding handling required: plot_table is only ASCII
+                f.write("".join(plot_table))
+            content.append(str(rel_filepath))
+        else:
+            content.append("%\n")
+            content.extend(plot_table)
+
         content.append("};\n")
 
     if legend_text is not None: