Merge branch 'main' into implementation/slope-basic/pygal

Author: MarkusNeusinger

plots/slope-basic/implementations/python/bokeh.py

@@ -1,16 +1,26 @@
-""" pyplots.ai
+""" anyplot.ai
 slope-basic: Basic Slope Chart (Slopegraph)
-Library: bokeh 3.8.1 | Python 3.13.11
-Quality: 91/100 | Created: 2025-12-23
+Library: bokeh 3.9.0 | Python 3.13.13
+Quality: 84/100 | Updated: 2026-04-30
 """
 
+import os
+
 from bokeh.io import export_png, save
-from bokeh.models import Label
+from bokeh.models import ColumnDataSource, HoverTool, Label
 from bokeh.plotting import figure
 from bokeh.resources import CDN
 
 
-# Data - Product sales comparison Q1 vs Q4 (10 products)
+THEME = os.getenv("ANYPLOT_THEME", "light")
+PAGE_BG = "#FAF8F1" if THEME == "light" else "#1A1A17"
+ELEVATED_BG = "#FFFDF6" if THEME == "light" else "#242420"
+INK = "#1A1A17" if THEME == "light" else "#F0EFE8"
+INK_SOFT = "#4A4A44" if THEME == "light" else "#B8B7B0"
+
+INCREASE_COLOR = "#009E73"  # Okabe-Ito position 1 (brand green)
+DECREASE_COLOR = "#D55E00"  # Okabe-Ito position 2 (vermillion)
+
 products = [
     "Product A",
     "Product B",
@@ -26,66 +36,115 @@
 q1_sales = [85, 72, 91, 45, 68, 53, 78, 62, 40, 88]
 q4_sales = [92, 65, 88, 71, 74, 48, 95, 58, 67, 82]
 
-# Determine direction for color coding
-colors = []
-for start, end in zip(q1_sales, q4_sales, strict=True):
-    if end > start:
-        colors.append("#306998")  # Python Blue - increase
-    elif end < start:
-        colors.append("#FFD43B")  # Python Yellow - decrease
-    else:
-        colors.append("#888888")  # Gray - no change
-
-# Create figure
+colors = [INCREASE_COLOR if end > start else DECREASE_COLOR for start, end in zip(q1_sales, q4_sales, strict=True)]
+
+
+def spread_labels(ys, min_gap=4.5):
+    """Shift label y-positions apart so dense clusters don't overlap."""
+    n = len(ys)
+    order = sorted(range(n), key=lambda i: ys[i])
+    adjusted = [float(ys[i]) for i in order]
+    for _ in range(30):
+        changed = False
+        for i in range(1, n):
+            if adjusted[i] - adjusted[i - 1] < min_gap:
+                mid = (adjusted[i] + adjusted[i - 1]) / 2
+                adjusted[i - 1] = mid - min_gap / 2
+                adjusted[i] = mid + min_gap / 2
+                changed = True
+        if not changed:
+            break
+    result = [0.0] * n
+    for new_i, orig_i in enumerate(order):
+        result[orig_i] = adjusted[new_i]
+    return result
+
+
+left_y = spread_labels(q1_sales)
+right_y = spread_labels(q4_sales)
+
 p = figure(
     width=4800,
     height=2700,
-    title="slope-basic · bokeh · pyplots.ai",
+    title="slope-basic · bokeh · anyplot.ai",
     x_range=(-0.5, 1.5),
-    y_range=(25, 105),
+    y_range=(25, 112),
     toolbar_location=None,
 )
 
-# Style title and axes
+p.background_fill_color = PAGE_BG
+p.border_fill_color = PAGE_BG
+p.outline_line_color = None
+
 p.title.text_font_size = "32pt"
 p.title.align = "center"
+p.title.text_color = INK
 
-# Remove x axis tick labels and set custom labels for time points
 p.xaxis.visible = False
 p.yaxis.axis_label = "Sales (thousands)"
 p.yaxis.axis_label_text_font_size = "22pt"
+p.yaxis.axis_label_text_color = INK
 p.yaxis.major_label_text_font_size = "18pt"
+p.yaxis.major_label_text_color = INK_SOFT
+p.yaxis.axis_line_color = INK_SOFT
+p.yaxis.major_tick_line_color = INK_SOFT
+
+p.xgrid.grid_line_color = None
+p.ygrid.grid_line_color = INK_SOFT
+p.ygrid.grid_line_alpha = 0.10
 
-# Add time point labels at bottom
-p.add_layout(Label(x=0, y=32, text="Q1", text_font_size="28pt", text_align="center", text_baseline="top"))
-p.add_layout(Label(x=1, y=32, text="Q4", text_font_size="28pt", text_align="center", text_baseline="top"))
+# Time point labels
+for x_pos, label in [(0, "Q1"), (1, "Q4")]:
+    p.add_layout(
+        Label(
+            x=x_pos, y=27, text=label, text_font_size="28pt", text_align="center", text_baseline="top", text_color=INK
+        )
+    )
+
+# Direction legend in upper-center (above data range)
+for y_pos, legend_text, color in [(109, "— Increase", INCREASE_COLOR), (103, "— Decrease", DECREASE_COLOR)]:
+    p.add_layout(
+        Label(
+            x=0.5,
+            y=y_pos,
+            text=legend_text,
+            text_font_size="20pt",
+            text_align="center",
+            text_baseline="middle",
+            text_color=color,
+        )
+    )
 
-# Draw slope lines connecting Q1 to Q4 for each product
+# ColumnDataSource for scatter enables HoverTool
+scatter_data: dict[str, list] = {"x": [], "y": [], "color": [], "product": [], "period": [], "value": []}
 for product, start, end, color in zip(products, q1_sales, q4_sales, colors, strict=True):
-    # Draw the connecting line
-    p.line(x=[0, 1], y=[start, end], line_width=4, line_color=color, line_alpha=0.8)
+    scatter_data["x"].extend([0, 1])
+    scatter_data["y"].extend([start, end])
+    scatter_data["color"].extend([color, color])
+    scatter_data["product"].extend([product, product])
+    scatter_data["period"].extend(["Q1", "Q4"])
+    scatter_data["value"].extend([start, end])
 
-    # Add markers at both endpoints
-    p.scatter(x=[0, 1], y=[start, end], size=18, color=color, alpha=0.9)
+source = ColumnDataSource(data=scatter_data)
 
-    # Add labels at start (Q1) - left aligned
+# Draw slope lines and endpoint labels
+for i, (product, start, end, color) in enumerate(zip(products, q1_sales, q4_sales, colors, strict=True)):
+    p.line(x=[0, 1], y=[start, end], line_width=4, line_color=color, line_alpha=0.8)
     p.add_layout(
         Label(
             x=-0.05,
-            y=start,
+            y=left_y[i],
             text=f"{product}: {start}",
             text_font_size="18pt",
             text_align="right",
             text_baseline="middle",
             text_color=color,
         )
     )
-
-    # Add labels at end (Q4) - right aligned
     p.add_layout(
         Label(
             x=1.05,
-            y=end,
+            y=right_y[i],
             text=f"{end}: {product}",
             text_font_size="18pt",
             text_align="left",
@@ -94,16 +153,12 @@
         )
     )
 
-# Style grid
-p.xgrid.grid_line_color = None
-p.ygrid.grid_line_alpha = 0.3
-p.ygrid.grid_line_dash = "dashed"
-
-# Style outline
-p.outline_line_color = None
-
-# Save as PNG
-export_png(p, filename="plot.png")
+dots = p.scatter(x="x", y="y", size=18, color="color", source=source, alpha=0.9)
+p.add_tools(
+    HoverTool(
+        renderers=[dots], tooltips=[("Product", "@product"), ("Period", "@period"), ("Sales", "@value{0} thousand")]
+    )
+)
 
-# Also save as HTML for interactive viewing
-save(p, filename="plot.html", resources=CDN, title="slope-basic · bokeh · pyplots.ai")
+export_png(p, filename=f"plot-{THEME}.png")
+save(p, filename=f"plot-{THEME}.html", resources=CDN, title="slope-basic · bokeh · anyplot.ai")

plots/slope-basic/implementations/python/matplotlib.py

@@ -1,29 +1,35 @@
-""" pyplots.ai
+""" anyplot.ai
 slope-basic: Basic Slope Chart (Slopegraph)
-Library: matplotlib 3.10.8 | Python 3.13.11
-Quality: 91/100 | Created: 2025-12-23
+Library: matplotlib 3.10.9 | Python 3.13.13
+Quality: 90/100 | Updated: 2026-04-30
 """
 
+import os
+
 import matplotlib.pyplot as plt
+import matplotlib.ticker as mticker
 from matplotlib.lines import Line2D
 
 
-# Data: Sales figures (in millions $) for products comparing Q1 vs Q4
-# Deterministic data with well-spaced values to avoid label overlap
+# Theme
+THEME = os.getenv("ANYPLOT_THEME", "light")
+PAGE_BG = "#FAF8F1" if THEME == "light" else "#1A1A17"
+ELEVATED_BG = "#FFFDF6" if THEME == "light" else "#242420"
+INK = "#1A1A17" if THEME == "light" else "#F0EFE8"
+INK_SOFT = "#4A4A44" if THEME == "light" else "#B8B7B0"
+
+COLOR_INC = "#009E73"  # Okabe-Ito pos 1 — increase (brand green)
+COLOR_DEC = "#D55E00"  # Okabe-Ito pos 2 — decrease (vermillion)
+
+# Data
 products = ["Product A", "Product B", "Product C", "Product D", "Product E", "Product F", "Product G", "Product H"]
 q1_sales = [3.0, 6.5, 10.0, 13.5, 17.0, 20.5, 24.0, 27.5]
 q4_sales = [5.5, 4.0, 14.0, 11.0, 20.0, 17.5, 28.0, 25.0]
-
-# Calculate changes to determine colors
 changes = [q4 - q1 for q1, q4 in zip(q1_sales, q4_sales, strict=True)]
 
-# Create figure
-fig, ax = plt.subplots(figsize=(16, 9))
-
-# Label collision avoidance: sort and adjust positions if too close
+# Label collision avoidance: sort by value and nudge positions if too close
 min_gap = 1.8
 
-# Adjust Q1 labels (left side)
 q1_indexed = sorted(enumerate(q1_sales), key=lambda x: x[1])
 q1_label_pos = [0.0] * len(q1_sales)
 for i, (orig_idx, val) in enumerate(q1_indexed):
@@ -36,7 +42,6 @@
         else:
             q1_label_pos[orig_idx] = val
 
-# Adjust Q4 labels (right side)
 q4_indexed = sorted(enumerate(q4_sales), key=lambda x: x[1])
 q4_label_pos = [0.0] * len(q4_sales)
 for i, (orig_idx, val) in enumerate(q4_indexed):
@@ -49,47 +54,76 @@
         else:
             q4_label_pos[orig_idx] = val
 
-# Plot each slope line
+# Plot
+fig, ax = plt.subplots(figsize=(16, 9), facecolor=PAGE_BG)
+ax.set_facecolor(PAGE_BG)
+
 x_positions = [0, 1]
+
+# Vertical column lines at axis positions — structural anchors for the slopegraph
+for x in x_positions:
+    ax.axvline(x, color=INK_SOFT, linewidth=1.2, alpha=0.35, zorder=0)
+
 for i, (product, q1, q4, change) in enumerate(zip(products, q1_sales, q4_sales, changes, strict=True)):
-    # Color by direction: blue for increase, yellow/orange for decrease
-    color = "#306998" if change >= 0 else "#FFD43B"
-    ax.plot(x_positions, [q1, q4], marker="o", markersize=12, linewidth=3, color=color)
-
-    # Labels at both endpoints with adjusted positions to avoid overlap
-    ax.text(
-        -0.05,
-        q1_label_pos[i],
-        f"{product}: ${q1:.1f}M",
-        ha="right",
-        va="center",
-        fontsize=14,
+    color = COLOR_INC if change >= 0 else COLOR_DEC
+    ax.plot(
+        x_positions,
+        [q1, q4],
+        marker="o",
+        markersize=12,
+        linewidth=3,
         color=color,
-        fontweight="bold",
+        markeredgecolor=PAGE_BG,
+        markeredgewidth=1.5,
     )
-    ax.text(1.05, q4_label_pos[i], f"${q4:.1f}M", ha="left", va="center", fontsize=14, color=color, fontweight="bold")
 
-# Style the axes
-ax.set_xlim(-0.6, 1.6)
+    # Left label: product name + Q1 value; dotted connector if label was nudged
+    lpos = q1_label_pos[i]
+    if abs(lpos - q1) > 0.05:
+        ax.plot([-0.03, -0.03], [q1, lpos], color=color, linewidth=0.8, alpha=0.35, linestyle=":")
+    ax.text(-0.06, lpos, f"{product}: ${q1:.1f}M", ha="right", va="center", fontsize=16, color=color, fontweight="bold")
+
+    # Right label: product name + Q4 value; dotted connector if label was nudged
+    rpos = q4_label_pos[i]
+    if abs(rpos - q4) > 0.05:
+        ax.plot([1.03, 1.03], [q4, rpos], color=color, linewidth=0.8, alpha=0.35, linestyle=":")
+    ax.text(1.06, rpos, f"{product}: ${q4:.1f}M", ha="left", va="center", fontsize=16, color=color, fontweight="bold")
+
+# Style
+ax.set_xlim(-0.75, 1.75)
 ax.set_xticks(x_positions)
-ax.set_xticklabels(["Q1 2024", "Q4 2024"], fontsize=20, fontweight="bold")
-ax.set_ylabel("Sales (Millions $)", fontsize=20)
-ax.set_title("slope-basic · matplotlib · pyplots.ai", fontsize=24)
+ax.set_xticklabels(["Q1 2024", "Q4 2024"], fontsize=20, fontweight="bold", color=INK)
+ax.set_ylabel("Sales", fontsize=20, color=INK)
+ax.set_title("slope-basic · matplotlib · anyplot.ai", fontsize=24, fontweight="medium", color=INK)
+
+ax.tick_params(axis="x", length=0)
+ax.tick_params(axis="y", labelsize=16, labelcolor=INK_SOFT, colors=INK_SOFT)
+
+# FuncFormatter for y-axis: show units inline as "$XM" for self-documenting tick labels
+ax.yaxis.set_major_formatter(mticker.FuncFormatter(lambda val, _: f"${val:.0f}M"))
 
-# Remove spines and set grid
 ax.spines["top"].set_visible(False)
 ax.spines["right"].set_visible(False)
 ax.spines["bottom"].set_visible(False)
-ax.tick_params(axis="y", labelsize=16)
-ax.tick_params(axis="x", length=0)
-ax.grid(True, axis="y", alpha=0.3, linestyle="--")
+ax.spines["left"].set_color(INK_SOFT)
+
+ax.grid(True, axis="y", alpha=0.10, linewidth=0.8, color=INK)
 
-# Add legend for color coding
+# Legend centered below title
 legend_elements = [
-    Line2D([0], [0], color="#306998", linewidth=3, label="Increase"),
-    Line2D([0], [0], color="#FFD43B", linewidth=3, label="Decrease"),
+    Line2D(
+        [0], [0], color=COLOR_INC, linewidth=3, marker="o", markersize=10, markeredgecolor=PAGE_BG, label="Increase"
+    ),
+    Line2D(
+        [0], [0], color=COLOR_DEC, linewidth=3, marker="o", markersize=10, markeredgecolor=PAGE_BG, label="Decrease"
+    ),
 ]
-ax.legend(handles=legend_elements, loc="upper right", fontsize=16)
+leg = ax.legend(
+    handles=legend_elements, loc="upper center", bbox_to_anchor=(0.5, 0.98), fontsize=16, frameon=True, ncol=2
+)
+leg.get_frame().set_facecolor(ELEVATED_BG)
+leg.get_frame().set_edgecolor(INK_SOFT)
+plt.setp(leg.get_texts(), color=INK_SOFT)
 
 plt.tight_layout()
-plt.savefig("plot.png", dpi=300, bbox_inches="tight")
+plt.savefig(f"plot-{THEME}.png", dpi=300, bbox_inches="tight", facecolor=PAGE_BG)