Updates in legend

pyproject.toml

@@ -72,11 +72,11 @@ testing = [
 
 docs = [
   "mkdocs",
-  "mkdocs-autorefs==0.5.0",
-  "mkdocs-material==9.5.2",
+  "mkdocs-autorefs==1.0.1",
+  "mkdocs-material==9.5.23",
   "mkdocs-material-extensions==1.3.1",
-  "mkdocstrings==0.24.0",
-  "mkdocstrings-python==1.7.5",
+  "mkdocstrings==0.25.2",
+  "mkdocstrings-python==1.10.8",
   "mkdocs-gen-files",
   "matplotlib>=3.8.2",
   "imageio>=2.9.0",

tests/test_canvas.py

@@ -222,7 +222,7 @@ def test_legend(backend: str):
     if backend == "vispy":
         pytest.skip("vispy does not support legend")
     canvas = new_canvas(backend=backend)
-    canvas.add_line([0, 1, 2], [0, 1, 2], name="line")
+    canvas.add_line([0, 1, 2], [0, 1, 2])
     canvas.add_markers([0, 1, 2], [0, 1, 2], name="markers")
     canvas.add_bars([0, 1, 2], [0, 1, 2], name="bars")
     canvas.add_line([3, 4, 5], [1, 2, 1], name="plot").with_markers()

tests/test_logics.py

@@ -45,6 +45,14 @@
     layer.band_width
     layer.band_width = 0.5
 
+def test_line_with_methods():
+    canvas = new_canvas(backend="mock")
+    line = canvas.add_line([1, 2], [4, 5])
+    with pytest.raises(TypeError):
+        line.with_xband([1, 1], alpha=[1, 2])
+        line.with_yfill([0, 1])
+        line.with_yfill(0.1, alpha=[1, 2])
+
 def test_hover_template():
     canvas = new_canvas(backend="mock")
     layer = canvas.add_markers([1, 2, 3], [4, 5, 6])

whitecanvas/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 from whitecanvas import theme
 from whitecanvas.canvas import link_axes

whitecanvas/backend/matplotlib/canvas.py

@@ -309,10 +309,16 @@ def _plt_make_legend(
         if artists:
             loc, bbox_to_anchor = _LEGEND_LOC_MAP[anchor]
             font_size = self._plt_get_xticks()._plt_get_size()
-            self._axes.legend(
+            leg = self._axes.legend(
                 artists, names, loc=loc, bbox_to_anchor=bbox_to_anchor,
                 prop={"size": font_size},
             )  # fmt: skip
+            for item, text in zip(leg.legend_handles, leg.texts):
+                if isinstance(item, plt.Rectangle):
+                    extent = item.get_window_extent(leg.figure.canvas.get_renderer())
+                    width = extent.width
+                    text.set_fontweight("bold")
+                    text.set_position((-1.5 * width, 0))
             if anchor.is_side:
                 self._axes.figure.tight_layout()
 

whitecanvas/backend/pyqtgraph/_labels.py

@@ -92,7 +92,7 @@ def _plt_set_text(self, text: str):
         self._get_axis().setLabel(text, **self._css)
 
     def _plt_get_color(self):
-        return np.array(Color(self._css["color"]))
+        return np.fromiter(Color(self._css["color"]), dtype=np.float32)
 
     def _plt_set_color(self, color):
         css = self._css.copy()

whitecanvas/canvas/_base.py

@@ -52,6 +52,7 @@
     Symbol,
 )
 from whitecanvas.utils.normalize import as_array_1d, normalize_xy
+from whitecanvas.utils.predicate import not_starts_with_underscore
 from whitecanvas.utils.type_check import is_real_number
 
 if TYPE_CHECKING:
@@ -99,7 +100,7 @@ def _draw_canvas(self):
         self._canvas()._plt_draw()
         self.events.drawn.emit()
 
-    def _coerce_name(self, name: str | None, default: str = "data") -> str:
+    def _coerce_name(self, name: str | None, default: str = "_data") -> str:
         if name is None:
             basename = default
             name = f"{default}-0"
@@ -743,6 +744,7 @@ def add_legend(
         *,
         location: Location | LocationStr = "top_right",
         title: str | None = None,
+        name_filter: Callable[[str], bool] = not_starts_with_underscore,
     ):
         """
         Add legend items to the canvas.
@@ -779,6 +781,8 @@ def add_legend(
             ```
         title : str, optional
             If given, title label will be added as the first legend item.
+        name_filter : callable, default not_starts_with_underscore
+            A callable that returns True if the name should be included in the legend.
         """
         if layers is None:
             layers = list(self.layers)
@@ -791,6 +795,8 @@ def add_legend(
             if isinstance(layer, str):
                 items.append((layer, _legend.TitleItem()))
             elif isinstance(layer, _l.Layer):
+                if not name_filter(layer.name):
+                    continue
                 items.append((layer.name, layer._as_legend_item()))
             else:
                 raise TypeError(f"Expected a list of layer or str, got {type(layer)}.")

whitecanvas/canvas/_joint.py

@@ -3,6 +3,7 @@
 from abc import ABC, abstractmethod
 from typing import (
     TYPE_CHECKING,
+    Callable,
     Iterator,
     Literal,
     Sequence,
@@ -31,6 +32,7 @@
     OrientationLike,
     Symbol,
 )
+from whitecanvas.utils.predicate import not_starts_with_underscore
 
 if TYPE_CHECKING:
     from typing_extensions import Self
@@ -164,13 +166,15 @@ def _link_marginal_to_main(self, layer: _l.Layer, main: _l.Layer) -> None:
     def add_legend(
         self,
         layers: Sequence[str | _l.Layer] | None = None,
-        location: Location | LocationStr = "top_right",
         *,
+        location: Location | LocationStr = "top_right",
         title: str | None = None,
+        name_filter: Callable[[str], bool] = not_starts_with_underscore,
     ):
         """Add legend to the main canvas."""
-        self.main_canvas.add_legend(layers, location=location, title=title)
-        return None
+        return self.main_canvas.add_legend(
+            layers, location=location, title=title, name_filter=name_filter
+        )
 
     def add_markers(
         self,

whitecanvas/canvas/_namespaces.py

@@ -122,7 +122,7 @@ def color(self):
 
     @color.setter
     def color(self, color):
-        self._get_object()._plt_set_color(np.array(Color(color)))
+        self._get_object()._plt_set_color(np.fromiter(Color(color), dtype=np.float32))
 
     @property
     def size(self) -> float:
@@ -333,7 +333,7 @@ def color(self):
 
     @color.setter
     def color(self, color):
-        self._get_object()._plt_set_color(np.array(Color(color)))
+        self._get_object()._plt_set_color(np.fromiter(Color(color), dtype=np.float32))
         self._draw_canvas()
 
     @property

whitecanvas/layers/_mixin.py

@@ -722,7 +722,7 @@ def _make_sure_hatch_visible(self):
         _is_no_width = self.edge.width == 0
         if isinstance(self._edge_namespace, MultiEdge):
             if np.any(_is_no_width):
-                ec = np.array(get_theme().foreground_color, dtype=np.float32)
+                ec = np.fromiter(get_theme().foreground_color, dtype=np.float32)
                 self.edge.width = np.where(_is_no_width, 1, self.edge.width)
                 ec_old = self.edge.color
                 ec_old[_is_no_width] = ec[np.newaxis]
@@ -848,7 +848,7 @@ def __init__(self):
     def _make_sure_hatch_visible(self):
         _is_no_width = self.edge.width == 0
         if np.any(_is_no_width):
-            ec = np.array(get_theme().foreground_color, dtype=np.float32)
+            ec = np.fromiter(get_theme().foreground_color, dtype=np.float32)
             self.edge.width = np.where(_is_no_width, 1, self.edge.width)
             ec_old = self.edge.color
             ec_old[_is_no_width] = ec[np.newaxis]