gratinglab 0.2.1__tar.gz → 0.2.3__tar.gz

{gratinglab-0.2.1/src/gratinglab.egg-info → gratinglab-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gratinglab
-Version: 0.2.1
+Version: 0.2.3
 Summary: Open platform for diffraction grating groove metrology and efficiency analysis
 Author: Jake McCoy, Aditi Gangadharan
 License: BSD-3-Clause
@@ -22,7 +22,7 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.26
 Requires-Dist: scipy>=1.11
 Requires-Dist: pydantic>=2.6
-Requires-Dist: endstation>=0.2.2
+Requires-Dist: endstation>=0.2.6
 Requires-Dist: threadpoolctl>=3.1
 Provides-Extra: dev
 Requires-Dist: pytest>=7; extra == "dev"
@@ -34,7 +34,7 @@ Provides-Extra: gui
 Requires-Dist: matplotlib>=3.8; extra == "gui"
 Requires-Dist: PySide6-Essentials!=6.12.0,>=6.7; python_version < "3.12" and extra == "gui"
 Requires-Dist: PySide6-Essentials>=6.7; python_version >= "3.12" and extra == "gui"
-Requires-Dist: endstation[qt]>=0.2.2; extra == "gui"
+Requires-Dist: endstation[qt]>=0.2.6; extra == "gui"
 Provides-Extra: metrology
 Requires-Dist: matplotlib>=3.9; extra == "metrology"
 Provides-Extra: refractiveindex

{gratinglab-0.2.1 → gratinglab-0.2.3}/pyproject.toml

@@ -51,7 +51,7 @@ dependencies = [
     # `dependencies = []` and has a test that fails if that stops being true,
     # so this line adds no transitive weight -- the Qt and matplotlib parts sit
     # behind its own extras, which our `gui` extra asks for by name.
-    "endstation>=0.2.2",
+    "endstation>=0.2.6",
     # The rigorous solvers cap BLAS threads for the length of a solve
     # (solvers/_execution.py): OpenBLAS's thread-per-core default made RCWA
     # up to 135x slower on a busy machine, measured in benchmarks/
@@ -85,7 +85,7 @@ gui = [
     "matplotlib>=3.8",
     "PySide6-Essentials>=6.7,!=6.12.0; python_version < '3.12'",
     "PySide6-Essentials>=6.7; python_version >= '3.12'",
-    "endstation[qt]>=0.2.2",
+    "endstation[qt]>=0.2.6",
 ]
 # Groove metrology: reading AFM scans and averaging them into a boundary
 # profile. An extra for the same reason the GUI is one -- `pip install

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/__init__.py

@@ -22,7 +22,7 @@ from .measured import MeasuredEfficiency, MeasurementProvenance
 from .resolution import ResolvingPower, resolving_power
 from .result import EfficiencyScan, OrderEfficiency, Provenance
 
-__version__ = "0.2.1"
+__version__ = "0.2.3"
 
 __all__ = [
     "Illumination",

gratinglab-0.2.3/src/gratinglab/gui/__init__.py

@@ -0,0 +1,30 @@
+"""The desktop layer: two windows and the chooser that opens them.
+
+Only :mod:`gratinglab.gui.qt` may import a toolkit. This module stays
+toolkit-free so the console-script entry points, which live beside it, can
+explain a missing PySide6 before anything tries to import it.
+"""
+
+from __future__ import annotations
+
+from endstation.optional import MissingExtra, require_extra
+
+__all__ = ["STILL_WORKS", "exit_without_qt"]
+
+#: What a missing toolkit leaves working. Without it, a user who wanted only
+#: the solvers reads an absent GUI extra as a broken install.
+STILL_WORKS = "Everything except the GUI works without it."
+
+
+def exit_without_qt() -> None:
+    """Exit with an install instruction if PySide6 is not installed.
+
+    The check is :func:`endstation.optional.require_extra`, a ``find_spec``
+    call rather than an import. Its :class:`~endstation.optional.MissingExtra`
+    becomes ``SystemExit`` here, so a console script prints the message and
+    not a traceback naming a package the user never asked for.
+    """
+    try:
+        require_extra("PySide6", "gui", still_works=STILL_WORKS)
+    except MissingExtra as exc:
+        raise SystemExit(str(exc)) from exc

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/gui/app.py

@@ -15,22 +15,14 @@ from __future__ import annotations
 
 import sys
 
-_QT_HELP = """\
-gratinglab-gui needs PySide6, which this install does not have.
-
-  pip install -e ".[gui]"        (from a checkout)
-  pip install gratinglab[gui]    (once published)
-
-Everything except the GUI works without it.
-"""
+from . import exit_without_qt
 
 
 def _require_qt():
     """Import PySide6 with an explanation instead of a traceback."""
-    try:
-        from PySide6.QtWidgets import QApplication
-    except ImportError as exc:  # pragma: no cover - depends on the install
-        raise SystemExit(_QT_HELP) from exc
+    exit_without_qt()
+    from PySide6.QtWidgets import QApplication
+
     return QApplication
 
 

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/gui/launcher.py

@@ -28,16 +28,9 @@ from __future__ import annotations
 import sys
 from dataclasses import dataclass
 
-__all__ = ["Mode", "MODES", "mode", "main"]
-
-_QT_HELP = """\
-gratinglab-app needs PySide6, which this install does not have.
-
-  pip install -e ".[gui]"        (from a checkout)
-  pip install gratinglab[gui]
+from . import exit_without_qt
 
-Everything except the GUI works without it.
-"""
+__all__ = ["Mode", "MODES", "mode", "main"]
 
 
 @dataclass(frozen=True)
@@ -91,10 +84,9 @@ def mode(key: str) -> Mode:
 
 def _require_qt():
     """Import PySide6 with an explanation instead of a traceback."""
-    try:
-        from PySide6.QtWidgets import QApplication
-    except ImportError as exc:  # pragma: no cover - depends on the install
-        raise SystemExit(_QT_HELP) from exc
+    exit_without_qt()
+    from PySide6.QtWidgets import QApplication
+
     return QApplication
 
 

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/gui/qt/__init__.py

@@ -14,9 +14,8 @@ headlessly.
 
 from __future__ import annotations
 
-import os
-
 # matplotlib's Qt shim picks a binding from sys.modules first and QT_API
-# second. Without this, a stray PyQt5 in the environment would win and its
-# canvas would refuse to parent into a PySide6 window.
-os.environ.setdefault("QT_API", "PySide6")
+# second. Without QT_API, a stray PyQt5 in the environment would win and its
+# canvas would refuse to parent into a PySide6 window. Importing endstation.qt
+# sets it, with setdefault, before anything here imports matplotlib.
+import endstation.qt  # noqa: F401

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/gui/qt/main_window.py

@@ -25,6 +25,7 @@ from __future__ import annotations
 
 import threading
 
+from endstation.qt.tokens import StaleGuard
 from PySide6.QtCore import Qt, QThread, QTimer, Signal
 from PySide6.QtGui import QKeySequence
 from PySide6.QtWidgets import (
@@ -131,12 +132,12 @@ class MainWindow(QMainWindow):
 
         self._themes = theming.install(QApplication.instance())
         # Solves run on a worker thread; keep the cycle collector off it.
-        from .gc_guard import guard
+        from endstation.qt.gc_guard import guard
 
         guard(self)
 
         self._parsed = None
-        self._token = 0
+        self._tokens = StaleGuard()
         self._running = False
         self._active_name: str | None = None
         # Replaced per solve rather than reused, so a Cancel clicked between
@@ -441,7 +442,7 @@ class MainWindow(QMainWindow):
 
         self._active_name = name
         self._parsed = geometry
-        self._token += 1
+        token = self._tokens.issue()
         self._cancel = threading.Event()
         self._set_running(True)
         tab.show_solving(len(geometry.wavelengths))
@@ -455,7 +456,7 @@ class MainWindow(QMainWindow):
             _PROGRESS_DELAY_MS, tab, lambda: self._show_progress_if_still_running(tab)
         )
         signal = self._convergence_requested if sweep else self._requested
-        signal.emit(self._token, name, geometry, options, self._cancel)
+        signal.emit(token, name, geometry, options, self._cancel)
 
     def cancel(self) -> None:
         """Stop the running solve.
@@ -475,13 +476,13 @@ class MainWindow(QMainWindow):
         if not self._running:
             return
         self._cancel.set()
-        self._token += 1
+        self._tokens.invalidate()
         self._set_running(False)
         if self._active_name is not None:
             self.tabs[self._active_name].show_cancelled()
 
     def _on_solved(self, token: int, method: str, result) -> None:
-        if token != self._token:
+        if self._tokens.is_stale(token):
             return  # cancelled or superseded; the window has moved on
         self._set_running(False)
         # No `profile_panel.draw` here any more: the groove's shape owes
@@ -501,7 +502,7 @@ class MainWindow(QMainWindow):
         be enough to move a bar backwards over a result the window has already
         replaced.
         """
-        if token != self._token or self._active_name is None:
+        if self._tokens.is_stale(token) or self._active_name is None:
             return
         self.tabs[self._active_name].show_progress_value(done, total)
 
@@ -515,7 +516,7 @@ class MainWindow(QMainWindow):
         """
 
     def _on_converged(self, token: int, method: str, result, report) -> None:
-        if token != self._token:
+        if self._tokens.is_stale(token):
             return
         self._set_running(False)
         self.geometry_tab.show_geometry(self._parsed)
@@ -525,7 +526,7 @@ class MainWindow(QMainWindow):
         self.solved.emit()
 
     def _on_failed(self, token: int, method: str, message: str) -> None:
-        if token != self._token:
+        if self._tokens.is_stale(token):
             return
         self._set_running(False)
         self.tabs[method].show_error(message)

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/gui/qt/worker.py

@@ -10,7 +10,8 @@ only the latter, because ``sweep`` reaches a NumPy-bound call with no check
 point and a Python thread cannot be killed, so there was nothing to interrupt
 from here. `Capabilities.reports_progress` changed that: the solver calls back
 once per wavelength, and a callback that raises
-:class:`~gratinglab.solvers.base.SolveCancelled` unwinds it.
+:class:`~endstation.progress.Cancelled` (or its subclass
+:class:`~gratinglab.solvers.base.SolveCancelled`) unwinds it.
 
 The token is still needed, because real cancellation does not remove the race
 it was covering. The worker may already have finished when Cancel is clicked,
@@ -28,10 +29,9 @@ from __future__ import annotations
 import threading
 from typing import TYPE_CHECKING, NamedTuple
 
+from endstation.progress import Cancelled, cancelling, throttled
 from PySide6.QtCore import QObject, Signal, Slot
 
-from ...solvers.base import SolveCancelled
-
 if TYPE_CHECKING:  # pragma: no cover - imports for type checkers only
     from ...checks import EnergyReport
     from ...result import EfficiencyScan
@@ -123,7 +123,7 @@ class SolveWorker(QObject):
                 progress=self._reporter(token, cancel),
             )[0]
             self.finished.emit(token, method, SolveResult(scan, _energy(scan)))
-        except SolveCancelled:
+        except Cancelled:
             # Before the broad handler: the user asked for this, so
             # it is not a failure and rendering it as one would be the same
             # category mistake M8 fixed for the no-coating default.
@@ -176,7 +176,7 @@ class SolveWorker(QObject):
                 SolveResult(report.scan, _energy(report.scan)),
                 report,
             )
-        except SolveCancelled:
+        except Cancelled:
             self.cancelled.emit(token, method)
         except Exception as exc:  # noqa: BLE001 - see `run`
             self.failed.emit(token, method, f"{type(exc).__name__}: {exc}")
@@ -190,16 +190,14 @@ class SolveWorker(QObject):
         that could not have been seen. The cancellation check is not
         throttled: it runs on every call, so a Cancel click takes effect at
         the next wavelength instead of the next percent.
+
+        Both halves are endstation's: :func:`~endstation.progress.throttled`
+        for the bar and :func:`~endstation.progress.cancelling` for the stop,
+        which raises :class:`~endstation.progress.Cancelled`, the base class
+        of :class:`~gratinglab.solvers.base.SolveCancelled`.
         """
-        last = -1
-
-        def report(done: int, total: int) -> None:
-            nonlocal last
-            percent = done * 100 // total if total else 100
-            if percent != last:
-                last = percent
-                self.progress.emit(token, done, total)
-            if cancel.is_set():
-                raise SolveCancelled(f"cancelled at {done} of {total}")
-
-        return report
+
+        def emit(done: int, total: int) -> None:
+            self.progress.emit(token, done, total)
+
+        return cancelling(throttled(emit), cancel.is_set)

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/gui/state.py

@@ -20,6 +20,7 @@ from __future__ import annotations
 from dataclasses import dataclass, replace
 
 from endstation.forms import FieldError as _FieldError
+from endstation.forms import FormErrors as _FormErrors
 from pathlib import Path
 from typing import Any
 
@@ -79,13 +80,11 @@ ANGLE_LABELS: dict[str, tuple[str, str | None]] = {
 #: from the module it is used in.
 FieldError = _FieldError
 
-
-class FormErrors(ValueError):
-    """Raised by :func:`build` when a form cannot be turned into a problem."""
-
-    def __init__(self, errors: tuple[FieldError, ...]) -> None:
-        self.errors = errors
-        super().__init__("; ".join(str(e) for e in errors))
+#: Raised by :func:`build`, and by each tab's ``build_options``, when a form
+#: cannot be turned into a problem. endstation's, re-exported for the same
+#: reason as `FieldError`. It derives from ``Exception``, not ``ValueError``
+#: as this module's own copy did; nothing here caught it as a ValueError.
+FormErrors = _FormErrors
 
 
 @dataclass(frozen=True, slots=True)

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/gui/theme.py

@@ -37,6 +37,7 @@ __all__ = [
     "order_colors",
     "provenance_colors",
     "rc_params",
+    "set_titles",
     "style_axes",
     "style_figure",
 ]
@@ -308,6 +309,27 @@ def style_axes(axes, theme: Theme) -> None:
             axis.line.set_color(theme.ink)
 
 
+#: Plot titles: what the panel is, at this size and weight, left-aligned.
+TITLE_SIZE = 11
+TITLE_WEIGHT = "semibold"
+#: The figures a panel reports beside its title, smaller and in ``muted``.
+DETAIL_SIZE = 9
+
+
+def set_titles(axes, title: str, detail: str | None = None, theme: Theme | None = None) -> None:
+    """Title a panel: its name on the left, the numbers it reports on the right.
+
+    One style for every plot, so a title says what the panel is and never has
+    to carry a measurement, a setting or an explanation on a second line. The
+    detail is where those go, quieter than the title. Pass ``theme`` from a
+    caller that has one; otherwise the plain ``LIGHT`` colours are used.
+    """
+    theme = theme or LIGHT
+    axes.set_title(title, loc="left", fontsize=TITLE_SIZE, fontweight=TITLE_WEIGHT,
+                   color=theme.ink)
+    axes.set_title(detail or "", loc="right", fontsize=DETAIL_SIZE, color=theme.muted)
+
+
 def style_figure(figure, theme: Theme) -> None:
     """Restyle an existing figure and every axes on it."""
     figure.set_facecolor(theme.figure)

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/metrology/config.py

@@ -3,6 +3,8 @@ Configuration file for AFM blaze angle analysis
 """
 import os
 
+from endstation.paths import data_root, find_project_root
+
 # ============ PROJECT PATHS ============
 # All paths below are resolved relative to the project root, not the current
 # working directory, so the analysis runs the same from anywhere.
@@ -16,22 +18,16 @@ import os
 # An installed (non-editable) copy has no project root above it; fall back to the
 # working directory so `pip install gratinglab[metrology]` still runs against a user's
 # own data and results folders.
-def _find_project_root(start):
-    # pyproject.toml only. Searching for a "data" directory looked reasonable and
-    # was wrong: this package contains its own data subpackage
-    # (gratinglab/metrology/data/aggregation.py), so the walk stopped immediately and
-    # DATA_DIR pointed inside the source tree.
-    path = os.path.dirname(os.path.abspath(start))
-    while True:
-        if os.path.isfile(os.path.join(path, 'pyproject.toml')):
-            return path
-        parent = os.path.dirname(path)
-        if parent == path:
-            return os.getcwd()
-        path = parent
-
-
-PROJECT_ROOT = _find_project_root(__file__)
+#
+# pyproject.toml only, not endstation's default markers. Searching for a "data"
+# directory looked reasonable and was wrong: this package contains its own data
+# subpackage (gratinglab/metrology/data/aggregation.py), so the walk stopped
+# immediately and DATA_DIR pointed inside the source tree. A `.git` marker is
+# no better: an installed copy inside some other checkout would claim that
+# checkout's root.
+#
+# Kept as a str, as it always was: every consumer builds paths with os.path.
+PROJECT_ROOT = str(find_project_root(__file__, markers=("pyproject.toml",)))
 RESULTS_DIR = os.path.join(PROJECT_ROOT, 'results')
 
 # Scans live *outside* the checkout, and are not committed.
@@ -45,7 +41,7 @@ RESULTS_DIR = os.path.join(PROJECT_ROOT, 'results')
 #
 # Point GRATINGLAB_AFM_DIR somewhere else to override.
 DEFAULT_AFM_DIR = os.path.join(os.path.expanduser('~'), 'Documents', 'afm_scans')
-DATA_DIR = os.environ.get('GRATINGLAB_AFM_DIR') or DEFAULT_AFM_DIR
+DATA_DIR = str(data_root('GRATINGLAB_AFM_DIR', DEFAULT_AFM_DIR))
 
 
 def resolve_path(name):

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/metrology/gui/__init__.py

@@ -23,15 +23,16 @@ Importing `gui.qt` requires PySide6, which is an optional extra::
 """
 from __future__ import annotations
 
+from endstation.optional import missing_extra_message, require_extra
+
 __all__ = ["main", "require_qt", "QT_MISSING_MESSAGE"]
 
-QT_MISSING_MESSAGE = (
-    "the Qt interface needs PySide6, which is an optional extra.\n"
-    "Install it with:\n\n"
-    "    pip install -e '.[gui]'\n\n"
+_STILL_WORKS = (
     "The analysis, the .ggp export and the ICC diagnostic all work without it."
 )
 
+QT_MISSING_MESSAGE = missing_extra_message("PySide6", "gui", still_works=_STILL_WORKS)
+
 
 def require_qt() -> None:
     """Raise something useful rather than a bare ImportError.
@@ -39,16 +40,13 @@ def require_qt() -> None:
     ``ModuleNotFoundError: No module named 'PySide6'`` tells a user nothing about
     what to do, and this is the most likely first-run failure.
 
-    The check uses find_spec instead of an import because this module sits
-    outside `gui/qt`, and the rule that only `gui/qt` touches a toolkit is
-    enforced by `tests/test_gui_boundary.py`. Checking availability should
-    also not cost a full toolkit import, since the aim is to fail quickly and
-    clearly.
+    The check is :func:`endstation.optional.require_extra`, a ``find_spec``
+    call rather than an import, because this module sits outside `gui/qt` and
+    the rule that only `gui/qt` touches a toolkit is enforced by
+    `tests/test_gui_boundary.py`. It raises
+    :class:`~endstation.optional.MissingExtra`, a ``ModuleNotFoundError``.
     """
-    from importlib.util import find_spec
-
-    if find_spec("PySide6") is None:  # pragma: no cover - depends on environment
-        raise ModuleNotFoundError(QT_MISSING_MESSAGE)
+    require_extra("PySide6", "gui", still_works=_STILL_WORKS)
 
 
 def main(argv=None):

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/metrology/gui/qt/__init__.py

@@ -10,10 +10,12 @@ it belongs in `gui/state.py`, which is pure and tested headlessly.
 """
 from __future__ import annotations
 
-import os
-
 # matplotlib's Qt shim picks a binding from sys.modules first and QT_API second.
-# Without this, a stray PyQt5 in the environment would win and its canvas would
-# refuse to parent into a PySide6 window. This project shipped PyQt5 until
-# recently, so that stray binding is a realistic thing to find installed.
-os.environ.setdefault("QT_API", "PySide6")
+# Without QT_API, a stray PyQt5 in the environment would win and its canvas
+# would refuse to parent into a PySide6 window. This project shipped PyQt5
+# until recently, so that stray binding is a realistic thing to find installed.
+# Importing endstation.qt sets it, with setdefault; the modules here run
+# `from . import *` first thing to get this import, so it exports nothing.
+import endstation.qt  # noqa: F401
+
+__all__: list[str] = []

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/metrology/gui/qt/boundary_view.py

@@ -21,14 +21,16 @@ import os
 from . import *  # noqa: F401,F403 - sets QT_API before matplotlib's shim loads
 
 from PySide6.QtWidgets import (
-    QCheckBox, QFileDialog, QFrame, QGroupBox, QHBoxLayout, QLabel,
-    QMessageBox, QPushButton, QScrollArea, QSpinBox, QVBoxLayout, QWidget,
+    QCheckBox, QFileDialog, QGroupBox, QHBoxLayout, QLabel,
+    QMessageBox, QPushButton, QSpinBox, QVBoxLayout, QWidget,
 )
 from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.figure import Figure
 
 from gratinglab.gui.qt import theming
-from gratinglab.gui.theme import style_figure
+from gratinglab.gui.theme import set_titles, style_figure
+
+from .layout import controls_beside
 
 from ...boundary import build_boundary_profile
 from ...core.tip import format_angles
@@ -65,7 +67,6 @@ class BoundaryView(QWidget):
         root.setSpacing(8)
 
         left = QWidget()
-        left.setFixedWidth(272)
         column = QVBoxLayout(left)
         column.setContentsMargins(0, 0, 0, 0)
         column.setSpacing(8)
@@ -73,23 +74,12 @@ class BoundaryView(QWidget):
         column.addWidget(self._build_metrics_group())
         column.addStretch()
 
-        scroll = QScrollArea()
-        scroll.setWidget(left)
-        scroll.setWidgetResizable(True)
-        scroll.setFixedWidth(292)
-        scroll.setFrameShape(QFrame.NoFrame)
-
         self.figure = Figure(figsize=(8, 6), tight_layout=True)
         self.canvas = FigureCanvas(self.figure)
         self._show_placeholder()
         theming.subscribe(self._on_theme)
 
-        root.addWidget(scroll)
-        divider = QFrame()
-        divider.setFrameShape(QFrame.VLine)
-        divider.setFrameShadow(QFrame.Sunken)
-        root.addWidget(divider)
-        root.addWidget(self.canvas, stretch=1)
+        root.addWidget(controls_beside(left, self.canvas), stretch=1)
 
     def _build_export_group(self):
         group = QGroupBox("Boundary profile")
@@ -327,7 +317,8 @@ class BoundaryView(QWidget):
                         alpha=0.8 if dark else 0.6)
         avg_ax.set_xlabel("Position (nm)", fontsize=10)
         avg_ax.set_ylabel("Height (nm)", fontsize=10)
-        avg_ax.set_title("Averaged groove", fontsize=10)
+        set_titles(avg_ax, "Averaged groove", f"{p.n_used} grooves",
+                   theming.current())
         avg_ax.legend(fontsize=8)
         avg_ax.grid(True, alpha=0.3)
 
@@ -336,9 +327,9 @@ class BoundaryView(QWidget):
         norm_ax.axhline(0, color=theming.current().ink, linestyle='--', linewidth=0.5)
         norm_ax.set_xlabel("Normalised position (0 to 1 = one period)", fontsize=10)
         norm_ax.set_ylabel("Height (fraction of period)", fontsize=10)
-        norm_ax.set_title(
-            f"Exported profile: {len(p.x_norm)} points, "
-            f"depth {p.metrics['groove_depth']:.4f} of period", fontsize=10)
+        set_titles(norm_ax, "Exported profile",
+                   f"{len(p.x_norm)} points, depth {p.metrics['groove_depth']:.4f} "
+                   "of period", theming.current())
         norm_ax.grid(True, alpha=0.3)
 
         self.canvas.draw()

{gratinglab-0.2.1 → gratinglab-0.2.3}/src/gratinglab/metrology/gui/qt/canvas.py

@@ -17,7 +17,7 @@ from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.figure import Figure
 
 from gratinglab.gui.qt import theming
-from gratinglab.gui.theme import style_figure
+from gratinglab.gui.theme import set_titles, style_figure
 
 __all__ = ["PlotCanvas"]
 
@@ -71,7 +71,8 @@ class PlotCanvas(FigureCanvas):
         ax.plot(disp_um, profile_nm, color='steelblue', linewidth=1.0)
         ax.set_xlabel("Position (µm)", fontsize=11)
         ax.set_ylabel("Height (nm)", fontsize=11)
-        ax.set_title(f"Raw profile, scan width {scan_size_um:.3f} µm", fontsize=11)
+        set_titles(ax, "Raw profile", f"scan width {scan_size_um:.3f} µm",
+                   theming.current())
         ax.grid(True, alpha=0.3)
         self.draw()
 
@@ -84,7 +85,8 @@ class PlotCanvas(FigureCanvas):
         self.fig.colorbar(im, ax=ax, label='Height (nm)')
         ax.set_xlabel("X (µm)", fontsize=11)
         ax.set_ylabel("Scan line", fontsize=11)
-        ax.set_title("Topography", fontsize=11)
+        set_titles(ax, "Topography", f"{data.shape[0]} scan lines",
+                   theming.current())
         self.draw()
 
     @_remembered
@@ -102,9 +104,9 @@ class PlotCanvas(FigureCanvas):
                 linewidth=1.8, label=f'Mean (n={n_groups})', zorder=5)
         ax.set_xlabel("Position (µm)", fontsize=11)
         ax.set_ylabel("Height (nm)", fontsize=11)
-        ax.set_title("Row-group profiles\n"
-                     f"{n_groups} groups × {group_info['rows_per_group']} rows each  |  "
-                     f"Scan width: {scan_size_um:.3f} µm", fontsize=10)
+        set_titles(ax, "Row-group profiles",
+                   f"{n_groups} groups of {group_info['rows_per_group']} rows, "
+                   f"scan width {scan_size_um:.3f} µm", theming.current())
         ax.legend(fontsize=10)
         ax.grid(True, alpha=0.3)
 
@@ -140,7 +142,8 @@ class PlotCanvas(FigureCanvas):
 
         ax.set_xlabel("Position (µm)", fontsize=11)
         ax.set_ylabel("Height (nm)", fontsize=11)
-        ax.set_title("Groove detection", fontsize=11)
+        set_titles(ax, "Groove detection", f"{len(centers)} grooves",
+                   theming.current())
         ax.legend(fontsize=9)
         ax.grid(True, alpha=0.3)
         self.draw()
@@ -160,8 +163,8 @@ class PlotCanvas(FigureCanvas):
                     label=f'Mean {mean:.2f}°')
         ax1.set_xlabel("Blaze angle (°)", fontsize=10)
         ax1.set_ylabel("Count", fontsize=10)
-        ax1.set_title(f"Distribution (N={len(angles)})\nσ={result['std_angle']:.2f}°",
-                      fontsize=10)
+        set_titles(ax1, "Distribution",
+                   f"N = {len(angles)}, σ = {result['std_angle']:.2f}°", theming.current())
         ax1.legend(fontsize=9)
         ax1.grid(True, alpha=0.3)
 
@@ -169,16 +172,18 @@ class PlotCanvas(FigureCanvas):
         ax2.hist(r2, bins=20, edgecolor=theming.current().ink, alpha=0.75, color='seagreen')
         ax2.set_xlabel("Fit R²", fontsize=10)
         ax2.set_ylabel("Count", fontsize=10)
-        ax2.set_title(f"Fit quality\nworst R² = {np.nanmin(r2):.4f}", fontsize=10)
+        set_titles(ax2, "Fit quality", f"worst R² {np.nanmin(r2):.4f}",
+                   theming.current())
         ax2.grid(True, alpha=0.3)
 
         widths = np.array([q.get('blaze_width_nm', np.nan) for q in quality])
         ax3.plot(widths, angles, 'o', markersize=4, alpha=0.45, color='darkorange')
         ax3.set_xlabel("Blaze facet width (nm)", fontsize=10)
         ax3.set_ylabel("Blaze angle (°)", fontsize=10)
-        ax3.set_title("Angle vs facet width\n(narrow facets = unreliable fits)",
-                      fontsize=10)
+        set_titles(ax3, "Angle against facet width", "narrow facets fit poorly",
+                   theming.current())
         ax3.grid(True, alpha=0.3)
 
-        self.fig.suptitle(f"Blaze angle {mean:.2f}° ± {sem:.3f}° (SEM)", fontsize=11)
+        self.fig.suptitle(f"Blaze angle {mean:.2f}° ± {sem:.3f}° (SEM)",
+                          x=0.01, ha="left", fontsize=12, fontweight="semibold")
         self.draw()