Working with latest matplotlib, scale_lines also now scales markers.

isaacrobinson2000 · isaacrobinson2000 · commit 523f5c2d3e06 · 2024-09-22T19:44:29.000-04:00
diff --git a/matplotview/_transform_renderer.py b/matplotview/_transform_renderer.py
@@ -251,6 +251,76 @@ def _draw_text_as_path(
         # checked above... (Above case causes error)
         super()._draw_text_as_path(gc, x, y, s, prop, angle, ismath)
 
+    def draw_markers(
+        self,
+        gc,
+        marker_path,
+        marker_trans,
+        path,
+        trans,
+        rgbFace = None,
+    ):
+        # If the markers need to be scaled accurately (such as in log scale), just use the fallback as each will need
+        # to be scaled separately.
+        if(self.__scale_widths):
+            super().draw_markers(gc, marker_path, marker_trans, path, trans, rgbFace)
+            return
+
+        # Otherwise we transform just the marker offsets (not the marker patch), so they stay the same size.
+        path = path.deepcopy()
+        path.vertices = self._get_transfer_transform(trans).transform(path.vertices)
+        bbox = self._get_axes_display_box()
+
+        # Change the clip to the sub-axes box
+        gc.set_clip_rectangle(bbox)
+        if (not isinstance(self.__bounding_axes.patch, Rectangle)):
+            gc.set_clip_path(TransformedPatchPath(self.__bounding_axes.patch))
+
+        rgbFace = tuple(rgbFace) if (rgbFace is not None) else None
+        self.__renderer.draw_markers(gc, marker_path, marker_trans, path, IdentityTransform(), rgbFace)
+
+    def draw_path_collection(
+        self,
+        gc,
+        master_transform,
+        paths,
+        all_transforms,
+        offsets,
+        offset_trans,
+        facecolors,
+        edgecolors,
+        linewidths,
+        linestyles,
+        antialiaseds,
+        urls,
+        offset_position,
+    ):
+        # If we want accurate scaling for each marker (such as in log scale), just use superclass implementation...
+        if(self.__scale_widths):
+            super().draw_path_collection(
+                gc, master_transform, paths, all_transforms, offsets, offset_trans, facecolors,
+                edgecolors, linewidths, linestyles, antialiaseds, urls, offset_position
+            )
+            return
+
+        # Otherwise we transform just the offsets, and pass them to the backend.
+        print(offsets)
+        if(np.any(np.isnan(offsets))):
+            raise ValueError("???")
+        offsets = self._get_transfer_transform(offset_trans).transform(offsets)
+        print(offsets)
+        bbox = self._get_axes_display_box()
+
+        # Change the clip to the sub-axes box
+        gc.set_clip_rectangle(bbox)
+        if (not isinstance(self.__bounding_axes.patch, Rectangle)):
+            gc.set_clip_path(TransformedPatchPath(self.__bounding_axes.patch))
+
+        self.__renderer.draw_path_collection(
+            gc, master_transform, paths, all_transforms, offsets, IdentityTransform(), facecolors,
+            edgecolors, linewidths, linestyles, antialiaseds, urls, None
+        )
+
     def draw_gouraud_triangle(
         self,
         gc: GraphicsContextBase,
diff --git a/matplotview/tests/test_view_rendering.py b/matplotview/tests/test_view_rendering.py
@@ -240,3 +240,76 @@ def test_stop_viewing(fig_test, fig_ref):
 
     ax1_ref.plot(data)
     ax1_ref.text(0.5, 0.5, "Hello")
+
+
+@check_figures_equal()
+def test_log_line(fig_test, fig_ref):
+    data = [i for i in range(10)]
+
+    # Test case... Create a view and stop it...
+    ax1_test, ax2_test = fig_test.subplots(1, 2)
+
+    ax1_test.set(xscale="log", yscale="log")
+    ax1_test.plot(data, "-o")
+
+    view(ax2_test, ax1_test, scale_lines=False)
+    ax2_test.set_xlim(-1, 10)
+    ax2_test.set_ylim(-1, 10)
+
+    # Reference, just don't plot anything at all in the second axes...
+    ax1_ref, ax2_ref = fig_ref.subplots(1, 2)
+
+    ax1_ref.set(xscale="log", yscale="log")
+    ax1_ref.plot(data, "-o")
+    ax2_ref.plot(data, "-o")
+    ax2_ref.set_xlim(-1, 10)
+    ax2_ref.set_ylim(-1, 10)
+
+
+@check_figures_equal()
+def test_log_scatter(fig_test, fig_ref):
+    data = [i for i in range(1, 11)]
+
+    # Test case... Create a view and stop it...
+    ax1_test, ax2_test = fig_test.subplots(1, 2)
+
+    ax1_test.set(xscale="log", yscale="log")
+    ax1_test.scatter(data, data)
+
+    view(ax2_test, ax1_test, scale_lines=False)
+    ax2_test.set_xlim(-5, 15)
+    ax2_test.set_ylim(-5, 15)
+
+    # Reference, just don't plot anything at all in the second axes...
+    ax1_ref, ax2_ref = fig_ref.subplots(1, 2)
+
+    ax1_ref.set(xscale="log", yscale="log")
+    ax1_ref.scatter(data, data)
+    ax2_ref.scatter(data, data)
+    ax2_ref.set_xlim(-5, 15)
+    ax2_ref.set_ylim(-5, 15)
+
+
+@check_figures_equal()
+def test_log_scatter_with_colors(fig_test, fig_ref):
+    data = [i for i in range(1, 11)]
+    colors = list("rgbrgbrgbr")
+
+    # Test case... Create a view and stop it...
+    ax1_test, ax2_test = fig_test.subplots(1, 2)
+
+    ax1_test.set(xscale="log", yscale="log")
+    ax1_test.scatter(data, data, color=colors)
+
+    view(ax2_test, ax1_test, scale_lines=False)
+    ax2_test.set_xlim(-5, 15)
+    ax2_test.set_ylim(-5, 15)
+
+    # Reference, just don't plot anything at all in the second axes...
+    ax1_ref, ax2_ref = fig_ref.subplots(1, 2)
+
+    ax1_ref.set(xscale="log", yscale="log")
+    ax1_ref.scatter(data, data, color=colors)
+    ax2_ref.scatter(data, data, color=colors)
+    ax2_ref.set_xlim(-5, 15)
+    ax2_ref.set_ylim(-5, 15)
