Export polar grid colors in mplexporter

Author: robertoffmoura

plotly/matplotlylib/mplexporter/utils.py

@@ -257,13 +257,14 @@ def get_axis_properties(axis):
 
 def get_grid_style(axis):
     gridlines = axis.get_gridlines()
-    if axis.get_tick_params()["gridOn"] and len(gridlines) > 0:
-        color = export_color(gridlines[0].get_color())
-        alpha = gridlines[0].get_alpha()
-        dasharray = get_dasharray(gridlines[0])
-        return dict(gridOn=True, color=color, dasharray=dasharray, alpha=alpha)
-    else:
+    if len(gridlines) == 0:
         return {"gridOn": False}
+    return dict(
+        gridOn=axis.get_tick_params().get("gridOn", False),
+        color=export_color(gridlines[0].get_color()),
+        dasharray=get_dasharray(gridlines[0]),
+        alpha=gridlines[0].get_alpha(),
+    )
 
 
 def get_figure_properties(fig):

plotly/matplotlylib/renderer.py

@@ -99,18 +99,9 @@ def _open_polar_axes(self, ax, props):
         )
         theta_offset = ax.get_theta_offset()
         theta_direction = ax.get_theta_direction()
-        angular_gridlines = ax.xaxis.get_gridlines()
-        radial_gridlines = ax.yaxis.get_gridlines()
-        angular_grid = (
-            (angular_gridlines[0].get_color(), angular_gridlines[0].get_visible())
-            if len(angular_gridlines)
-            else ("#b0b0b0", True)
-        )
-        radial_grid = (
-            (radial_gridlines[0].get_color(), radial_gridlines[0].get_visible())
-            if len(radial_gridlines)
-            else ("#b0b0b0", True)
-        )
+        axes = props.get("axes", [])
+        angular_grid = axes[0].get("grid", {}) if len(axes) > 0 else {}
+        radial_grid = axes[1].get("grid", {}) if len(axes) > 1 else {}
         frame = props.get("polar_frame")
         self.plotly_fig["layout"][self.current_polar_subplot] = go.layout.Polar(
             bgcolor=_export_color(props["axesbg"]),
@@ -119,8 +110,8 @@ def _open_polar_axes(self, ax, props):
                 direction=("counterclockwise" if theta_direction >= 0 else "clockwise"),
                 tickvals=[float(t) for t in np.degrees(ax.xaxis.get_majorticklocs())],
                 ticktext=[t.get_text() for t in ax.xaxis.get_majorticklabels()],
-                showgrid=angular_grid[1],
-                gridcolor=_export_color(angular_grid[0]),
+                showgrid=angular_grid.get("gridOn", True),
+                gridcolor=_export_color(angular_grid.get("color", "#B0B0B0")),
                 showline=frame["visible"] if frame else True,
                 linecolor=(_export_color(frame["color"]) if frame else "black"),
                 linewidth=frame["linewidth"] if frame else 1,
@@ -129,8 +120,8 @@ def _open_polar_axes(self, ax, props):
                 range=[float(v) for v in ax.get_ylim()],
                 tickvals=[float(t) for t in ax.yaxis.get_majorticklocs()],
                 ticktext=[t.get_text() for t in ax.yaxis.get_majorticklabels()],
-                showgrid=radial_grid[1],
-                gridcolor=_export_color(radial_grid[0]),
+                showgrid=radial_grid.get("gridOn", True),
+                gridcolor=_export_color(radial_grid.get("color", "#B0B0B0")),
                 showline=False,
             ),
         )

plotly/matplotlylib/tests/test_renderer.py

@@ -354,13 +354,34 @@ def test_polar_plot_converts():
     assert polar.angularaxis.ticktext[0] == "0°"
     assert polar.radialaxis.range == tuple(float(v) for v in ax.get_ylim())
     assert polar.bgcolor == "#FFFFFF"
-    assert polar.angularaxis.gridcolor == "#b0b0b0"
-    assert polar.radialaxis.gridcolor == "#b0b0b0"
+    assert polar.angularaxis.gridcolor == "#B0B0B0"
+    assert polar.radialaxis.gridcolor == "#B0B0B0"
     assert polar.angularaxis.linecolor == "#000000"
     assert polar.angularaxis.linewidth == 0.8
     assert polar.radialaxis.showline is False
 
 
+def test_polar_grid_with_tuple_color():
+    """Polar axes with tuple grid colors convert successfully."""
+    fig, ax = plt.subplots(subplot_kw={"projection": "polar"})
+    ax.grid(color=(0.5, 0.5, 0.5))
+    plotly_fig = tls.mpl_to_plotly(fig)
+
+    assert plotly_fig.layout.polar.angularaxis.gridcolor == "#7F7F7F"
+    assert plotly_fig.layout.polar.radialaxis.gridcolor == "#7F7F7F"
+
+
+def test_cartesian_grid_with_tuple_color():
+    """Cartesian axes with tuple grid colors convert successfully."""
+    fig, ax = plt.subplots()
+    ax.grid(color=(0.5, 0.5, 0.5))
+    ax.plot([0, 1], [0, 1])
+    plotly_fig = tls.mpl_to_plotly(fig)
+
+    assert plotly_fig.layout.xaxis.showgrid is True
+    assert plotly_fig.layout.yaxis.showgrid is True
+
+
 def test_custom_date_xtickvals_given_as_numbers_are_converted():
     """Custom date ticks given as matplotlib date numbers must be converted
     to date strings."""