Merge pull request #415 from theRealSuperMario/logscale

Logscale

Author: nschloe

test/test_cleanfigure.py

@@ -33,6 +33,45 @@ def test_plot(self):
             assert numLinesRaw - numLinesClean == 18
         plt.close("all")
 
+    def test_logplot(self):
+        x = np.logspace(-3, 3, 20)
+        y = np.logspace(-3, 3, 20)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_yscale("log")
+            ax.set_ylim([10 ** (-2), 10 ** (2)])
+            ax.set_xlim([10 ** (-2), 10 ** (2)])
+            raw = get_tikz_code()
+
+            clean_figure(fig)
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 11
+        plt.close("all")
+
+    def test_semilogplot(self):
+        x = np.logspace(-3, 3, 20)
+        y = np.linspace(1, 100, 20)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_xlim([10 ** (-2), 10 ** (2)])
+            ax.set_ylim([20, 80])
+            raw = get_tikz_code()
+
+            clean_figure(fig)
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 6
+        plt.close("all")
+
     def test_step(self):
         x = np.linspace(1, 100, 20)
         y = np.linspace(1, 100, 20)

tikzplotlib/_cleanfigure.py

@@ -229,8 +229,8 @@ def _cleanline(fighandle, axhandle, linehandle, target_resolution, scale_precisi
         visual_data = _get_visual_data(axhandle, data, is3D)
 
         if not is3D:
-            data = _move_points_closer(xLim, yLim, data)
-            visual_data = _get_visual_data(axhandle, data, is3D)
+            visual_data = _move_points_closer(xLim, yLim, visual_data)
+            visual_data = _get_visual_data(axhandle, visual_data, is3D)
 
         hasMarkers = not linehandle.get_marker() == "None"
         hasLines = not linehandle.get_linestyle() == "None"
@@ -276,8 +276,8 @@ def _clean_collections(
     visual_data = _get_visual_data(axhandle, data, is3D)
 
     if not is3D:
-        data = _move_points_closer(xLim, yLim, data)
-        visual_data = _get_visual_data(axhandle, data, is3D)
+        visual_data = _move_points_closer(xLim, yLim, visual_data)
+        visual_data = _get_visual_data(axhandle, visual_data, is3D)
 
     hasMarkers = True
     hasLines = False
@@ -325,17 +325,17 @@ def _get_visual_limits(fighandle, axhandle):
     xLim = np.array(axhandle.get_xlim())
     yLim = np.array(axhandle.get_ylim())
     if is3D:
-        zLim = np.array(axhandle.get_ylim())
+        zLim = np.array(axhandle.get_zlim())
 
     # Check for logarithmic scales
-    isXlog = axhandle.get_xscale() == "log"
+    isXlog = _axIsXLog(axhandle)
     if isXlog:
         xLim = np.log10(xLim)
-    isYLog = axhandle.get_yscale() == "log"
+    isYLog = _axIsYLog(axhandle)
     if isYLog:
         yLim = np.log10(yLim)
     if is3D:
-        isZLog = axhandle.get_zscale() == "log"
+        isZLog = _axIsZLog(axhandle)
         if isZLog:
             zLim = np.log10(zLim)
 
@@ -542,6 +542,18 @@ def _axIs3D(axhandle):
     return hasattr(axhandle, "get_zlim")
 
 
+def _axIsXLog(axhandle):
+    return axhandle.get_xscale() == "log"
+
+
+def _axIsYLog(axhandle):
+    return axhandle.get_yscale() == "log"
+
+
+def _axIsZLog(axhandle3D):
+    return axhandle3D.get_zscale() == "log"
+
+
 def _get_line_data(linehandle):
     """Retrieve 2D or 3D data from line object.