jarvisplot 1.4.1__tar.gz → 1.4.2__tar.gz

{jarvisplot-1.4.1 → jarvisplot-1.4.2}/JarvisPLOT.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 1.4.1
+Version: 1.4.2
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{jarvisplot-1.4.1 → jarvisplot-1.4.2}/JarvisPLOT.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ jarvisplot/Figure/colorbar_runtime.py
 jarvisplot/Figure/config_runtime.py
 jarvisplot/Figure/data_pipelines.py
 jarvisplot/Figure/density_cell_runtime.py
+jarvisplot/Figure/design_runtime.py
 jarvisplot/Figure/dynesty_runtime.py
 jarvisplot/Figure/figure.py
 jarvisplot/Figure/figure_types.py

{jarvisplot-1.4.1 → jarvisplot-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 1.4.1
+Version: 1.4.2
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

jarvisplot-1.4.2/jarvisplot/Figure/design_runtime.py

@@ -0,0 +1,137 @@
+#!/usr/bin/env python3
+"""Design-reference debug overlay for Jarvis-PLOT figures.
+
+When a figure is rendered with ``debug: true`` in the YAML, this module draws a
+dimension overlay on top of the finished figure: every axes defined by the style
+card is outlined and annotated with
+
+  - its name (``ax`` / ``axc`` / ``axtri`` / ``ax0`` ...),
+  - its position rect ``[left, bottom, width, height]`` in figure fractions
+    (exactly the ``Frame.axes.<name>.rect`` value from the style JSON card), and
+  - its width / height converted to centimetres from ``figure.figsize``.
+
+The primary axes additionally gets margin dimension lines (left / top / bottom
+insets), and colorbar axes get a gap dimension to the primary axes.
+
+The overlay never participates in data rendering; it is a read-only annotation
+layer added just before the figure is saved.  All drawing is wrapped so a
+failure here can never break a normal plot.
+"""
+
+from __future__ import annotations
+
+import matplotlib as mpl
+
+
+# overlay palette
+_DIM    = "#0A7FB6"   # blue dimension lines + labels
+_BOX    = "#111111"   # axes outline
+_NAME   = "#1A237E"   # axes name + rect text
+_MARGIN = "#FF3FA4"   # pink figure border / caption
+
+# order in which we look for the "primary" axes to fully dimension
+_PRIMARY_ORDER = ("ax", "ax0", "ax1", "axtri")
+
+
+def _raw(ax):
+    """Return the underlying matplotlib Axes for an adapter or raw Axes."""
+    return getattr(ax, "ax", ax)
+
+
+def _position(ax):
+    try:
+        bb = _raw(ax).get_position()
+        return float(bb.x0), float(bb.y0), float(bb.width), float(bb.height)
+    except Exception:
+        return None
+
+
+def draw_design_reference(fig) -> None:
+    """Draw the dimension overlay onto ``fig`` (a JarvisPLOT Figure wrapper)."""
+    try:
+        _draw(fig)
+    except Exception as exc:  # never break a real plot because of the overlay
+        logger = getattr(fig, "logger", None)
+        if logger is not None:
+            try:
+                logger.debug(f"design-reference overlay skipped: {exc}")
+            except Exception:
+                pass
+
+
+def _draw(fig) -> None:
+    F = fig.fig
+    w_in, h_in = (float(v) for v in F.get_size_inches())
+    w_cm, h_cm = w_in * 2.54, h_in * 2.54
+
+    ov = F.add_axes([0.0, 0.0, 1.0, 1.0], zorder=10_000)
+    ov.set_xlim(0.0, 1.0)
+    ov.set_ylim(0.0, 1.0)
+    ov.set_axis_off()
+    ov.patch.set_alpha(0.0)
+
+    def label(x, y, text, *, color=_DIM, size=5.0, ha="center", va="center",
+              rotation=0, weight="normal", family="monospace", boxed=True):
+        bbox = dict(boxstyle="square,pad=0.12", fc="white", ec="none", alpha=0.82) if boxed else None
+        ov.text(x, y, text, color=color, fontsize=size, ha=ha, va=va,
+                rotation=rotation, fontweight=weight, family=family, bbox=bbox,
+                zorder=10_002, clip_on=False)
+
+    def dim(x0, y0, x1, y1, text, *, vertical=False):
+        ov.annotate("", xy=(x1, y1), xytext=(x0, y0),
+                    arrowprops=dict(arrowstyle="<|-|>", color=_DIM, lw=0.7,
+                                    shrinkA=0, shrinkB=0, mutation_scale=6),
+                    zorder=10_001)
+        label((x0 + x1) / 2.0, (y0 + y1) / 2.0, text,
+              rotation=90 if vertical else 0)
+
+    # figure border + size caption
+    ov.add_patch(mpl.patches.Rectangle((0, 0), 1, 1, fill=False, ec=_MARGIN,
+                                       lw=0.9, zorder=10_001))
+    label(0.5, 0.995, f"design reference  ·  figure {w_cm:.2f} cm × {h_cm:.2f} cm",
+          color=_MARGIN, size=6.0, va="top", weight="bold", family="DejaVu Sans")
+
+    # total figure height marker on the far left
+    dim(0.012, 0.0, 0.012, 1.0, f"{h_cm:.2f} cm", vertical=True)
+
+    # pick the primary axes to fully dimension
+    primary = next((n for n in _PRIMARY_ORDER if n in fig.axes), None)
+    primary_pos = _position(fig.axes[primary]) if primary else None
+
+    for name, ax in fig.axes.items():
+        pos = _position(ax)
+        if pos is None:
+            continue
+        l, b, w, h = pos
+
+        # outline only, so the real plot underneath keeps its true colors
+        ov.add_patch(mpl.patches.Rectangle((l, b), w, h, fill=False, ec=_BOX,
+                                           lw=0.9, zorder=10_001))
+
+        # name + rect + cm sizes — anchored so the text stays inside the figure
+        if l + w / 2.0 > 0.6:            # axes sits in the right half
+            tx, ha = min(l + w, 0.992), "right"
+        else:
+            tx, ha = max(l + 0.012, 0.008), "left"
+        ty = min(b + h - 0.015, 0.93)
+        label(tx, ty, name, color=_NAME, size=7.0, ha=ha, va="top",
+              weight="bold", boxed=True)
+        label(tx, ty - 0.057,
+              f"[{l:.3f}, {b:.3f}, {w:.3f}, {h:.3f}]\n"
+              f"width: {w * w_cm:.3f} cm   height: {h * h_cm:.3f} cm",
+              color=_NAME, size=4.6, ha=ha, va="top", boxed=True)
+
+        if name == primary:
+            yt = b + h
+            # left inset (figure left edge → axes left edge), drawn along the top edge
+            dim(0.0, yt, l, yt, f"{l * w_cm:.3f} cm")
+            # top inset (axes top edge → figure top)
+            dim(l, yt, l, 1.0, f"{(1.0 - yt) * h_cm:.3f} cm", vertical=True)
+            # bottom inset (figure bottom → axes bottom edge)
+            dim(l, 0.0, l, b, f"{b * h_cm:.3f} cm", vertical=True)
+        elif name.startswith("axc") and primary_pos is not None:
+            # gap between the primary axes' right edge and this colorbar's left edge
+            pl, pb, pw, ph = primary_pos
+            ygap = b + h / 2.0
+            if l > pl + pw:
+                dim(pl + pw, ygap, l, ygap, f"{(l - (pl + pw)) * w_cm:.3f} cm")

{jarvisplot-1.4.1 → jarvisplot-1.4.2}/jarvisplot/Figure/figure.py

@@ -13,6 +13,7 @@ from .adapters_ternary import TernaryAxesAdapter
 from .method_registry import resolve_callable
 from .style_runtime import resolve_style_bundle_payload
 from .config_runtime import apply_figure_config
+from .design_runtime import draw_design_reference
 from .layer_runtime import (
     load_layer_runtime_data as runtime_load_layer_runtime_data,
     release_layer_runtime_data as runtime_release_layer_runtime_data,
@@ -975,16 +976,8 @@ class Figure:
     def plot(self):
         self.render()
         # for layer in self.layers:
-        if self.debug: 
-            if "axtri" in self.axes.keys():
-                # Demo of Scatter Clip
-                x = np.linspace(-1, 2, 121)
-                y = np.linspace(-1, 2, 121)
-                X, Y = np.meshgrid(x, y)
-                self.axtri.scatter(x=X.ravel() + 0.5 *  Y.ravel(), y=Y.ravel(), marker='.', s=1, facecolor="#0277BA", edgecolor="None")
-
-                # Demo of Plot Clip 
-                self.axtri.plot(x=[-1, 0.5, 0.5, 2], y=[-1.1, 0.6, 0.3, 1.8], linestyle="-", color="#0277BA")
+        if self.debug:
+            draw_design_reference(self)
         self.savefig()
         import matplotlib.pyplot as plt
         plt.close(self.fig)

{jarvisplot-1.4.1/jarvisplot/cards/a4paper/4x1 → jarvisplot-1.4.2/jarvisplot/cards/a4paper/2x1}/rect.json

@@ -86,6 +86,10 @@
                     "loc": "top",
                     "fontsize": 12,
                     "fontfamily": "STIXGeneral"
+                },
+                "ylabel_coords": {
+                    "x": -0.1,
+                    "y": 0.5
                 }
             }
         },

{jarvisplot-1.4.1/jarvisplot/cards/gambit → jarvisplot-1.4.2/jarvisplot/cards/a4paper}/2x1/ternary.json

@@ -124,6 +124,9 @@
                     "va":"center"
                 }
             }
+        },
+        "axlogo": {
+            "file": "&JP/jarvisplot/cards/icons/jarvisHEP.png"
         }
     },
     "Style": {

{jarvisplot-1.4.1/jarvisplot/cards/a4paper/4x1 → jarvisplot-1.4.2/jarvisplot/cards/gambit/2x1}/ternary.json

@@ -124,6 +124,23 @@
                     "va":"center"
                 }
             }
+        },
+        "axlogo": {
+            "file": "&JP/jarvisplot/cards/icons/gambit_small.png",
+            "text": [
+                {
+                    "x": 0.0,
+                    "y": -0.5,
+                    "s": "GAMBIT 2.7",
+                    "ha": "left",
+                    "va": "bottom",
+                    "color": "black",
+                    "fontfamily": "Fira code",
+                    "fontsize": 5.0,
+                    "fontstyle": "normal",
+                    "fontweight": "normal"
+                }
+            ]
         }
     },
     "Style": {

{jarvisplot-1.4.1 → jarvisplot-1.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "JarvisPLOT"
-version = "1.4.1"
+version = "1.4.2"
 description = "Jarvis-PLOT: YAML-driven plotting engine"
 readme = "README.md"
 requires-python = ">=3.10"