plot3 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

plot3/__version__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.2"

plot3/build.py

@@ -762,7 +762,7 @@ def expand_stat_geom(
                 if len(group_cols) > 1:
                     out_row[colour_col] = key_tuple[1]
                 outlier_rows.append(out_row)
-        frame = pd.DataFrame(rows)
+        frame = _keep_categories(pd.DataFrame(rows), data, [colour_col])
         box_width = float(getattr(geom, "width", 0.75))
         dodge_levels = None
         if len(group_cols) > 1 and not frame.empty:
@@ -920,7 +920,7 @@ def expand_stat_geom(
                 elif colour_col == xcol:
                     row[colour_col] = x_key
                 rows.append(row)
-        frame = pd.DataFrame(rows)
+        frame = _keep_categories(pd.DataFrame(rows), data, [colour_col])
         if frame.empty:
             frame = pd.DataFrame(columns=["x", "y", "group"])
         # Force categorical x scale labels via a helper frame for domains:
@@ -1423,6 +1423,48 @@ def _legend_position_spec(value):
 
 
 
+def _categorical_order(g, resolved, levels) -> list:
+    """Colour levels in the order of a categorical colour column, as ggplot2.
+
+    Stats (density, histogram, smooth, summaries) rebuild their data, so
+    their levels arrive sorted as text. When the plot's colour column is a
+    ``pd.Categorical``, its categories set the order (and so the colours);
+    levels it does not list keep their place after them.
+    """
+    data = getattr(g, "data", None)
+    if data is None:
+        return list(levels)
+    columns = dict.fromkeys(m.get("color") for _geom, m in resolved if isinstance(m.get("color"), str))
+    for column in columns:
+        if not has_column(data, column):
+            continue
+        source = materialize_columns(data, [column])[column]
+        if not isinstance(source.dtype, pd.CategoricalDtype):
+            continue
+        wanted = [str(c) for c in source.cat.categories]
+        present = [str(level) for level in levels]
+        first = [c for c in wanted if c in present]
+        return first + [level for level in present if level not in first]
+    return list(levels)
+
+
+def _keep_categories(frame: pd.DataFrame, data, columns) -> pd.DataFrame:
+    """Give a stat's output columns the category order of the source column.
+
+    Box and violin stats build their output from plain rows, which turns
+    ``pd.Categorical(..., categories=["placebo", "low", "high"])`` into
+    text, sorted alphabetically: the fill colours then disagree with the
+    points of the same column in another panel or layer.
+    """
+    for column in dict.fromkeys(c for c in columns if c):
+        if column not in frame.columns or not has_column(data, column):
+            continue
+        source = materialize_columns(data, [column])[column]
+        if isinstance(source.dtype, pd.CategoricalDtype):
+            frame[column] = pd.Categorical(frame[column], categories=list(source.cat.categories))
+    return frame
+
+
 def _forced_levels(g, ccats) -> list:
     """Colour levels shared by every facet panel, so a group keeps its colour."""
     forced = getattr(g, "_force_color_levels", None)
@@ -2826,6 +2868,7 @@ def build_spec(g: ggplot) -> tuple[dict, list[tuple[str, str]]]:
     # viridis_d scale, else the theme's colours extended past eight groups.
     cat_colours: list[str] = []
     if color_scale is not None and color_scale[0] == "cat":
+        color_scale[1] = _categorical_order(g, resolved, color_scale[1])
         user_scale = getattr(g, "colour_scale", None)
         if user_scale is not None and user_scale.kind == "continuous":
             raise ValueError(
@@ -3953,8 +3996,9 @@ html,body{{margin:0;height:100%;background:{theme["surface"]};color:{theme["ink"
   border:1px solid {theme["axis"]};border-radius:6px;overflow:hidden;
   background:{theme["surface"]}}}
 .plab{{padding:4px 8px;font-size:11px;color:{theme["ink2"]};
+  background:{theme.get("strip") or "transparent"};
   border-bottom:1px solid {theme["grid"]}}}
-.cstrip,.rstrip{{background:{theme["grid"]};color:{theme["ink2"]};font-size:11px;
+.cstrip,.rstrip{{background:{theme.get("strip") or theme["grid"]};color:{theme["ink2"]};font-size:11px;
   font-weight:600;display:flex;align-items:center;justify-content:center;border-radius:4px}}
 .rstrip span{{writing-mode:vertical-rl}}
 .panel iframe{{flex:1;width:100%;border:0;background:{theme["surface"]}}}

plot3/static.py

@@ -650,7 +650,9 @@ def _draw_facets(panels, layout, first_spec, theme, width, height, base_pt, comm
         0, 0, width, height, commands,
     )
     pad = 8.0
-    strip_bg = theme.get("grid") or "#1c2742"
+    # ggplot2's facet strips are grey85 in theme_grey and theme_bw; other
+    # themes fall back to the grid colour.
+    strip_bg = theme.get("strip") or theme.get("grid") or "#1c2742"
     ink2 = theme.get("ink2") or theme.get("ink") or "#ffffff"
     raw_labs = first_spec.get("labs") or {}
     x_title = _with_frame(raw_labs.get("x") or "", label)
@@ -2194,13 +2196,15 @@ def _paint_legend(commands, origin, metrics, theme, fonts) -> None:
     surface = theme.get("surface") or "#0b1020"
     grid = theme.get("grid") or "#1c2742"
     if _rgb(grid) == _rgb(surface):
-        grid = theme.get("muted") or "#898781"
+        # theme_grey / theme_classic: white grid on a white page. ggplot2
+        # draws no legend box, so neither do we (not a dark one instead).
+        grid = None
     tick = fonts[0]
     row_h = metrics["row_h"]
     lx, ly = origin
     # Opaque, so a legend inside the panel does not fade the marks under it.
     commands.append((
-        "rect", lx, ly, metrics["w"], metrics["h"], surface, grid, 1, 1.0,
+        "rect", lx, ly, metrics["w"], metrics["h"], surface, grid, 1 if grid else 0, 1.0,
     ))
     cursor = ly + 6
     for row in metrics["rows"]:

plot3/themes.py

@@ -53,7 +53,7 @@ _THEMES = {
     "bw": dict(
         surface="#ffffff", ink="#000000", ink2="#222222", muted="#4d4d4d",
         grid="#ebebeb", axis="#333333", cat=_CAT_LIGHT, seq=_SEQ,
-        frame="box",
+        frame="box", strip="#d9d9d9",
     ),
     # ggplot2 theme_classic: white page, no grid, black axis lines.
     "classic": dict(
@@ -78,7 +78,7 @@ _THEMES = {
     "grey": dict(
         surface="#ffffff", panel="#ebebeb", ink="#000000", ink2="#000000",
         muted="#4d4d4d", grid="#ffffff", axis="#ebebeb", cat=_CAT_LIGHT, seq=_SEQ,
-        frame="none",
+        frame="none", strip="#d9d9d9",
     ),
     # ggplot2 theme_linedraw: white panel, thin dark grid, black border.
     "linedraw": dict(

{plot3-0.6.0.dist-info → plot3-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.6.0
+Version: 0.6.2
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT
@@ -224,18 +224,27 @@ ggplot2's names and defaults.
 
 ```python
 rng = np.random.default_rng(1)
-trial = pd.DataFrame({"arm": rng.choice(["placebo", "low", "high"], 150),
+arms = ["placebo", "low", "high"]
+trial = pd.DataFrame({"arm": pd.Categorical(rng.choice(arms, 150), categories=arms),
                       "dose": rng.uniform(0, 10, 150)})
-trial["response"] = 2 + 0.6 * trial.dose + 1.5 * (trial.arm == "high") + rng.normal(0, 1.2, 150)
+slope = trial.arm.map({"placebo": 0.05, "low": 0.35, "high": 0.7}).astype(float)
+trial["response"] = 2 + slope * trial.dose + rng.normal(0, 0.9, 150)
 
 a = (ggplot(trial, aes(x="dose", y="response", colour="arm"))
-     + geom_point(alpha=0.7) + geom_smooth(method="lm"))
+     + geom_point(alpha=0.7) + geom_smooth(method="lm", se=False)
+     + scale_colour_hue() + theme_grey() + theme(legend_position="bottom"))
 b = (ggplot(trial, aes(x="arm", y="response", fill="arm"))
-     + geom_violin() + geom_jitter(width=0.1, height=0) + theme(legend_position="none"))
-fig = (a | b) + plot_annotation(title="Response by dose and arm", tag_levels="A")
+     + geom_violin() + geom_jitter(width=0.1, height=0)
+     + scale_fill_hue() + theme_grey() + theme(legend_position="none"))
+fig = ((a | b) + plot_layout(widths=[3, 2])
+       + plot_annotation(title="Response by dose and arm", tag_levels="A"))
 ```
 
-<img src="https://raw.githubusercontent.com/rleyvasal/plot3/main/docs/img/ggplot2_compose.png" alt="Two-panel figure: scatter with linear fits, and violins by arm">
+`scale_colour_hue()` and `theme_grey()` are ggplot2's own defaults, so the
+figure looks as it would from R. plot3's defaults are `theme_bw()` for saved
+files and `theme_dark()` in the viewer.
+
+<img src="https://raw.githubusercontent.com/rleyvasal/plot3/main/docs/img/ggplot2_look.png" alt="Two-panel figure in ggplot2's grey theme: response against dose with one fitted line per arm, and violins of response by arm">
 
 Everything else you'd expect is there, including histograms, densities,
 boxplots, bar positions, `stat_summary`, error bars, heatmaps, hexbins, 2D

{plot3-0.6.0.dist-info → plot3-0.6.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 plot3/__init__.py,sha256=-jbV46XmzHZJzv7jrfi50on5Xxs1PJ8U3aV7bbSm1VA,6016
-plot3/__version__.py,sha256=cID1jLnC_vj48GgMN6Yb1FA3JsQ95zNmCHmRYE8TFhY,22
+plot3/__version__.py,sha256=jFlbxEJFS0G44LE-yXXVSwXACA1J_NyYDk5E20_2zpc,22
 plot3/aesexpr.py,sha256=5GbKRX0FZFpDXCDzsZzZW32MKK3uI24Y9nabNJO5RRc,10449
-plot3/build.py,sha256=EuIqW3tg0tH2Gbr904eJtY_ejuwhcR0QpD54axpZiEc,168960
+plot3/build.py,sha256=cEiC9x34uplWWVCuNyAX-vpKbGiF3RIHhCyLHqqJ6EI,171107
 plot3/calculus.py,sha256=yBnZYVHKAehNIdZjYj7fWHadOTQBgSx5Ys8tNQaw11s,45442
 plot3/compose.py,sha256=BICOe1QMnI17k83YqJe8NBKs6lWnjuDox71Sv-erkM0,11513
 plot3/contour.py,sha256=YUrN7rtjjXR8if9L70EMJ6TswWbg9pY6-JSAqADAQEo,20401
@@ -23,13 +23,13 @@ plot3/scales.py,sha256=rBZbM7Z9YcJNjP7Vr3WwAukF2cDqAyGXWPx3Mo8Nko8,14197
 plot3/scaling.py,sha256=3z-m5sGh0BQcQQRIwlsX6tVaGGyMIF2DVcIEGHmY00Y,28316
 plot3/special.py,sha256=ARUav8LGcVe_cPbHoLy73O2U_2wuxUVjvoSwVYfm1-Y,12584
 plot3/stat2d.py,sha256=4a4C3HxBEOeRuMCQXHgLClxFIkPT2-Fz6DJZDev5kdg,66429
-plot3/static.py,sha256=0rcgEb52somhdcZNKL0cUyC04n6IFnVxJ3l2RroEGF4,154271
+plot3/static.py,sha256=erJR9Hsb_pv_WYYG7xRE-moNbMhON1ce1pu3Rajzv-E,154546
 plot3/stats3d.py,sha256=B6WCKen7eAHSMlkeo3tnfUGcA1tpdH4OVKOl_5vkbmo,15714
 plot3/table.py,sha256=v4G6NgbEPKv6RakSHLnvfdkWNAaApEgel9be0PzPUMA,26033
-plot3/themes.py,sha256=mK9zWm4nRLSDbH2xDJqdrRnnkb9bGUWByyI-x9ZupdU,5145
+plot3/themes.py,sha256=pQnsBApRRlwQxXPrBFJVYuo6kYan8bgdT3Nlm0T9XFg,5179
 plot3/viewer.py,sha256=tKhBkO7IJpDVs2_NdM87F1O2EVtuAGst1P7bI8gtr_A,141046
-plot3-0.6.0.dist-info/licenses/LICENSE,sha256=OPphTrXUbMt4GNrsK8juVty13iThKFPIPnu_nh4UlAk,1081
-plot3-0.6.0.dist-info/METADATA,sha256=2vsBMW0gt-otu5kR9V3eil-7pH4NreG3n7cvlpRIMsM,13806
-plot3-0.6.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-plot3-0.6.0.dist-info/top_level.txt,sha256=wFHSJTzHoaJCrffpONuI8hayEblnTzRMi2y3qCcKzD0,6
-plot3-0.6.0.dist-info/RECORD,,
+plot3-0.6.2.dist-info/licenses/LICENSE,sha256=OPphTrXUbMt4GNrsK8juVty13iThKFPIPnu_nh4UlAk,1081
+plot3-0.6.2.dist-info/METADATA,sha256=RFUINTip5JKVd8IWARh6jP0av8LFt8aSvDhq9dBqcN0,14318
+plot3-0.6.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+plot3-0.6.2.dist-info/top_level.txt,sha256=wFHSJTzHoaJCrffpONuI8hayEblnTzRMi2y3qCcKzD0,6
+plot3-0.6.2.dist-info/RECORD,,