plot3 0.5.0__tar.gz → 0.5.1__tar.gz

{plot3-0.5.0 → plot3-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.5.0
+Version: 0.5.1
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT

plot3-0.5.1/plot3/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{plot3-0.5.0 → plot3-0.5.1}/plot3/build.py

@@ -440,6 +440,22 @@ def _apply_fill(mapping: dict, kind: str) -> dict:
     return out
 
 
+def _layer_mapping(base_mapping, geom) -> dict:
+    """The plot's mapping with the layer's own on top, fill resolved per side.
+
+    A set colour (``geom_point(colour="black")`` under ``aes(colour=g)``)
+    replaces the inherited colour mapping for that layer, as in ggplot2, so
+    the layer neither recolours nor needs the column. Filled layers keep
+    it: there ``colour=`` is the outline.
+    """
+    kind = getattr(geom, "kind", None)
+    mapping = _apply_fill(dict(base_mapping), kind)
+    if getattr(geom, "const_color", None) is not None and kind not in _FILL_KINDS:
+        mapping.pop("color", None)
+    mapping.update(_apply_fill(dict(geom.mapping), kind))
+    return mapping
+
+
 _REF_KINDS = frozenset({"hline", "vline", "abline"})
 _MM_TO_PX = 96.0 / 25.4
 
@@ -571,8 +587,7 @@ def expand_stat_geom(
         layers = expand_vector_field(geom, transition, slider)
         return layers[0] if len(layers) == 1 else layers
     # Resolve fill per mapping, so a layer's own colour beats a base fill.
-    mapping = _apply_fill(dict(base_mapping), geom.kind)
-    mapping.update(_apply_fill(dict(geom.mapping), geom.kind))
+    mapping = _layer_mapping(base_mapping, geom)
     if geom.kind == "box3d":
         from plot3.stats3d import box3d_layers
 
@@ -1964,8 +1979,7 @@ def build_spec(g: ggplot) -> tuple[dict, list[tuple[str, str]]]:
         if getattr(geom, "_replace_mapping", False):
             m = dict(geom.mapping)
         else:
-            m = _apply_fill(dict(g.mapping), geom.kind)
-            m.update(_apply_fill(dict(geom.mapping), geom.kind))
+            m = _layer_mapping(g.mapping, geom)
         if "x" not in m or "y" not in m:
             raise ValueError("aes(x=, y=) are required (bar/histogram/density supply y)")
         if geom.kind == "surface" and "z" not in m:

{plot3-0.5.0 → plot3-0.5.1}/plot3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.5.0
+Version: 0.5.1
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT

{plot3-0.5.0 → plot3-0.5.1}/tests/test_grammar.py

@@ -97,3 +97,27 @@ def test_scale_colour_viridis_on_points(cloud):
 def test_unknown_add_raises(cars):
     with pytest.raises(TypeError, match="cannot add"):
         _ = ggplot(cars, aes(x="wt", y="mpg")) + 123
+
+
+def test_set_colour_replaces_inherited_colour_mapping():
+    # ggplot2: geom_point(colour = "black") under aes(colour = g) draws black,
+    # and the layer's own data need not have g.
+    import pandas as pd
+
+    from plot3 import aes, geom_boxplot, geom_point, ggplot
+    from plot3.build import build_spec
+
+    df = pd.DataFrame({"x": [1, 2, 3], "y": [1, 2, 3], "g": ["a", "b", "c"]})
+    centre = pd.DataFrame({"x": [2], "y": [2]})
+    spec, _ = build_spec(
+        ggplot(df, aes(x="x", y="y", colour="g")) + geom_point()
+        + geom_point(data=centre, colour="black", shape="cross")
+    )
+    assert spec["layers"][0].get("color") is not None
+    assert spec["layers"][1].get("color") is None
+    assert spec["layers"][1]["constColor"] == "#000000"
+    # A filled layer keeps its mapped fill under a set outline colour.
+    spec, _ = build_spec(
+        ggplot(df, aes(x="g", y="y", fill="g")) + geom_boxplot(colour="black")
+    )
+    assert spec["layers"][0].get("color") is not None

plot3-0.5.0/plot3/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.5.0"