Merge pull request #20197 from anntzer/fastlinemarkercolor

jklymak · web-flow · commit 4013e507ba7b · 2021-05-10T17:49:03.000-07:00
Speedup Line2D marker color setting.
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -1146,6 +1146,19 @@ def set_marker(self, marker):
         self._marker = MarkerStyle(marker, self._marker.get_fillstyle())
         self.stale = True
 
+    def _set_markercolor(self, attr, val):
+        if val is None:
+            val = 'auto'
+        current = getattr(self, attr)
+        if current is None:
+            self.stale = True
+        else:
+            neq = current != val
+            # Much faster than `np.any(current != val)` if no arrays are used.
+            if neq.any() if isinstance(neq, np.ndarray) else neq:
+                self.stale = True
+        setattr(self, attr, val)
+
     def set_markeredgecolor(self, ec):
         """
         Set the marker edge color.
@@ -1154,55 +1167,42 @@ def set_markeredgecolor(self, ec):
         ----------
         ec : color
         """
-        if ec is None:
-            ec = 'auto'
-        if (self._markeredgecolor is None
-                or np.any(self._markeredgecolor != ec)):
-            self.stale = True
-        self._markeredgecolor = ec
+        self._set_markercolor("_markeredgecolor", ec)
 
-    def set_markeredgewidth(self, ew):
+    def set_markerfacecolor(self, fc):
         """
-        Set the marker edge width in points.
+        Set the marker face color.
 
         Parameters
         ----------
-        ew : float
-             Marker edge width, in points.
+        fc : color
         """
-        if ew is None:
-            ew = rcParams['lines.markeredgewidth']
-        if self._markeredgewidth != ew:
-            self.stale = True
-        self._markeredgewidth = ew
+        self._set_markercolor("_markerfacecolor", fc)
 
-    def set_markerfacecolor(self, fc):
+    def set_markerfacecoloralt(self, fc):
         """
-        Set the marker face color.
+        Set the alternate marker face color.
 
         Parameters
         ----------
         fc : color
         """
-        if fc is None:
-            fc = 'auto'
-        if np.any(self._markerfacecolor != fc):
-            self.stale = True
-        self._markerfacecolor = fc
+        self._set_markercolor("_markerfacecoloralt", fc)
 
-    def set_markerfacecoloralt(self, fc):
+    def set_markeredgewidth(self, ew):
         """
-        Set the alternate marker face color.
+        Set the marker edge width in points.
 
         Parameters
         ----------
-        fc : color
+        ew : float
+             Marker edge width, in points.
         """
-        if fc is None:
-            fc = 'auto'
-        if np.any(self._markerfacecoloralt != fc):
+        if ew is None:
+            ew = rcParams['lines.markeredgewidth']
+        if self._markeredgewidth != ew:
             self.stale = True
-        self._markerfacecoloralt = fc
+        self._markeredgewidth = ew
 
     def set_markersize(self, sz):
         """
