scatter: marker fill fix

Author: nschloe

tikzplotlib/_line2d.py

@@ -62,8 +62,12 @@ def draw_line2d(data, obj):
 
     marker_face_color = obj.get_markerfacecolor()
     marker_edge_color = obj.get_markeredgecolor()
+
+    is_filled = marker_face_color is not None and not (
+        isinstance(marker_face_color, str) and marker_face_color.lower() == "none"
+    )
     data, marker, extra_mark_options = _mpl_marker2pgfp_marker(
-        data, obj.get_marker(), marker_face_color
+        data, obj.get_marker(), is_filled
     )
     if marker:
         _marker(

tikzplotlib/_markers.py

@@ -37,7 +37,7 @@
 }
 
 
-def _mpl_marker2pgfp_marker(data, mpl_marker, marker_face_color):
+def _mpl_marker2pgfp_marker(data, mpl_marker: str, is_filled: bool):
     """Translates a marker style of matplotlib to the corresponding style
     in PGFPlots.
     """
@@ -47,7 +47,7 @@ def _mpl_marker2pgfp_marker(data, mpl_marker, marker_face_color):
     except KeyError:
         pass
     else:
-        if (marker_face_color is not None) and pgfplots_marker == "o":
+        if is_filled and pgfplots_marker == "o":
             pgfplots_marker = "*"
             data["tikz libs"].add("plotmarks")
         marker_options = []
@@ -61,14 +61,7 @@ def _mpl_marker2pgfp_marker(data, mpl_marker, marker_face_color):
         # There's no equivalent for the pixel marker (,) in Pgfplots.
         pass
     else:
-        if (
-            marker_face_color is not None
-            and (
-                not isinstance(marker_face_color, str)
-                or marker_face_color.lower() != "none"
-            )
-            and pgfplots_marker not in ["|", "-", "asterisk", "star"]
-        ):
+        if is_filled and pgfplots_marker not in ["|", "-", "asterisk", "star"]:
             pgfplots_marker += "*"
         return data, pgfplots_marker, marker_options
 

tikzplotlib/_path.py

@@ -124,6 +124,8 @@ def draw_pathcollection(data, obj):
     draw_options = ["scatter", "only marks"]
     table_options = []
 
+    is_filled = False
+
     if obj.get_array() is not None:
         draw_options.append("scatter")
         dd_strings = np.column_stack([dd_strings, obj.get_array()])
@@ -153,7 +155,6 @@ def draw_pathcollection(data, obj):
             elif len(ec) == 1:
                 ec = ec[0]
             else:
-                print(ec)
                 assert len(ec) == len(dd)
                 labels.append("draw")
                 ec_strings = [
@@ -173,6 +174,7 @@ def draw_pathcollection(data, obj):
                 fc = None
             elif len(fc) == 1:
                 fc = fc[0]
+                is_filled = True
             else:
                 assert len(fc) == len(dd)
                 labels.append("fill")
@@ -183,6 +185,7 @@ def draw_pathcollection(data, obj):
                 dd_strings = np.column_stack([dd_strings, fc_strings])
                 add_individual_color_code = True
                 fc = None
+                is_filled = True
 
         try:
             ls = obj.get_linestyle()[0]
@@ -230,7 +233,7 @@ def draw_pathcollection(data, obj):
 
     if marker0 is not None:
         data, pgfplots_marker, marker_options = _mpl_marker2pgfp_marker(
-            data, marker0, fc
+            data, marker0, is_filled
         )
         draw_options += [f"mark={pgfplots_marker}"]
         if marker_options: