gratinglab 0.2.2__tar.gz → 0.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gratinglab
-Version: 0.2.2
+Version: 0.2.3
 Summary: Open platform for diffraction grating groove metrology and efficiency analysis
 Author: Jake McCoy, Aditi Gangadharan
 License: BSD-3-Clause

{gratinglab-0.2.2 → 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.2"
+__version__ = "0.2.3"
 
 __all__ = [
     "Illumination",

{gratinglab-0.2.2 → 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.2 → 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.2 → 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()

{gratinglab-0.2.2 → gratinglab-0.2.3}/src/gratinglab/metrology/gui/qt/efficiency_dialog.py

@@ -36,7 +36,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
 
 from gratinglab import materials
 from gratinglab.illumination import Illumination
@@ -286,7 +286,8 @@ class EfficiencyDialog(QDialog):
 
         axes.set_xlabel("Wavelength (nm)")
         axes.set_ylabel("Absolute efficiency")
-        axes.set_title(f"Measured groove, period {self._profile.period_nm:.2f} nm")
+        set_titles(axes, "Measured groove",
+                   f"period {self._profile.period_nm:.2f} nm", theming.current())
         axes.grid(True, alpha=0.3)
         axes.set_ylim(bottom=0)
         if carried:

{gratinglab-0.2.2 → gratinglab-0.2.3}/src/gratinglab/metrology/gui/qt/import_view.py

@@ -22,14 +22,16 @@ from . import *  # noqa: F401,F403 - sets QT_API before matplotlib's shim loads
 import numpy as np
 from PySide6.QtCore import Signal
 from PySide6.QtWidgets import (
-    QApplication, QComboBox, QDoubleSpinBox, QFileDialog, QFrame, QGroupBox,
-    QHBoxLayout, QLabel, QPushButton, QScrollArea, QSpinBox, QVBoxLayout, QWidget,
+    QApplication, QComboBox, QDoubleSpinBox, QFileDialog, QGroupBox,
+    QHBoxLayout, QLabel, 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 matplotlib.patches import Rectangle
 from matplotlib.widgets import RectangleSelector
 
@@ -96,7 +98,6 @@ class ImportView(QWidget):
         root.setSpacing(8)
 
         left = QWidget()
-        left.setFixedWidth(272)
         column = QVBoxLayout(left)
         column.setContentsMargins(0, 0, 0, 0)
         column.setSpacing(8)
@@ -106,23 +107,12 @@ class ImportView(QWidget):
         column.addWidget(self._build_profile_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_file_group(self):
         group = QGroupBox("File")
@@ -574,8 +564,8 @@ class ImportView(QWidget):
             minspanx=0, minspany=0, spancoords='data', interactive=False,
             props=dict(facecolor='crimson', edgecolor='crimson', alpha=0.25,
                        fill=True))
-        image_ax.set_title(
-            f"Image flattening: {self.image_method_combo.currentText()}", fontsize=10)
+        set_titles(image_ax, "Image flattening",
+                   self.image_method_combo.currentText(), theming.current())
 
         try:
             x_um, profile_nm = raw_data(self._flat, self._scan_size)
@@ -606,9 +596,9 @@ class ImportView(QWidget):
                         linewidth=1.0, label='After flattening')
         profile_ax.set_xlabel("Position (µm)", fontsize=10)
         profile_ax.set_ylabel("Height (nm)", fontsize=10)
-        profile_ax.set_title(
-            f"Profile flattening: {self.profile_method_combo.currentText()}"
-            f"  (removes {np.ptp(background):.1f} nm of background)", fontsize=10)
+        set_titles(profile_ax, "Profile flattening",
+                   f"{self.profile_method_combo.currentText()}, removes "
+                   f"{np.ptp(background):.1f} nm of background", theming.current())
         profile_ax.legend(fontsize=8)
         profile_ax.grid(True, alpha=0.3)
 

gratinglab-0.2.3/src/gratinglab/metrology/gui/qt/layout.py

@@ -0,0 +1,46 @@
+"""
+The controls-and-plot layout every AFM tab shares.
+
+Each tab was a fixed 272 px column of controls in a 292 px scroll area beside
+its plot, so long labels were crammed and nothing could be widened. A splitter
+replaces that: the column starts wide enough for its contents, cannot be
+dragged narrower than its widest control needs, and gives the plot every pixel
+the window gains.
+"""
+from __future__ import annotations
+
+from . import *  # noqa: F401,F403 - sets QT_API before matplotlib's shim loads
+
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QFrame, QScrollArea, QSplitter, QWidget
+
+__all__ = ["controls_beside", "MIN_CONTROLS_WIDTH", "START_CONTROLS_WIDTH"]
+
+#: Narrower than this and the group boxes' labels start to wrap mid-word.
+MIN_CONTROLS_WIDTH = 260
+#: Where the column starts, unless its contents ask for more.
+START_CONTROLS_WIDTH = 320
+
+
+def controls_beside(controls: QWidget, plot: QWidget) -> QSplitter:
+    """A splitter holding the scrolling ``controls`` column and the ``plot``."""
+    scroll = QScrollArea()
+    scroll.setWidget(controls)
+    scroll.setWidgetResizable(True)
+    scroll.setFrameShape(QFrame.NoFrame)
+    # Width is the splitter's to decide; only the height should ever scroll.
+    scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+
+    gutter = scroll.verticalScrollBar().sizeHint().width()
+    floor = max(MIN_CONTROLS_WIDTH, controls.minimumSizeHint().width() + gutter)
+    scroll.setMinimumWidth(floor)
+
+    splitter = QSplitter(Qt.Horizontal)
+    splitter.setChildrenCollapsible(False)
+    splitter.addWidget(scroll)
+    splitter.addWidget(plot)
+    splitter.setStretchFactor(0, 0)
+    splitter.setStretchFactor(1, 1)
+    start = max(START_CONTROLS_WIDTH, floor)
+    splitter.setSizes([start, max(1, 4 * start)])
+    return splitter

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

@@ -18,9 +18,7 @@ from endstation.qt.tokens import StaleGuard
 from PySide6.QtCore import Qt, QThread, Signal
 from PySide6.QtGui import QFont
 from PySide6.QtWidgets import (
-    QCheckBox, QComboBox, QDoubleSpinBox, QFrame,
-    QGroupBox, QHBoxLayout, QLabel, QMainWindow, QPushButton, QScrollArea,
-    QSpinBox, QStatusBar, QTabWidget, QVBoxLayout, QWidget,
+    QCheckBox, QComboBox, QDoubleSpinBox, QGroupBox, QHBoxLayout, QLabel, QMainWindow, QPushButton, QSpinBox, QStatusBar, QTabWidget, QVBoxLayout, QWidget,
 )
 from matplotlib.backends.backend_qtagg import NavigationToolbar2QT as NavigationToolbar
 
@@ -28,6 +26,7 @@ from ...core.processing import raw_data, raw_data_multi_group
 from ...core.tip import TIP_PRESETS, VALID_TIP_CORRECTIONS, format_angles
 from ...settings import (AnalysisSettings, MAX_FACET_TRIM, VALID_BLAZE_SIDES)
 from ..state import FormState, build, summarize_result
+from .layout import controls_beside
 from .canvas import PlotCanvas
 from .boundary_view import BoundaryView
 from .import_view import ImportView
@@ -107,7 +106,6 @@ class MainWindow(QMainWindow):
         root.setSpacing(8)
 
         left = QWidget()
-        left.setFixedWidth(272)
         left_layout = QVBoxLayout(left)
         left_layout.setContentsMargins(0, 0, 0, 0)
         left_layout.setSpacing(8)
@@ -115,12 +113,6 @@ class MainWindow(QMainWindow):
         left_layout.addWidget(self._build_view_group())
         left_layout.addStretch()
 
-        scroll = QScrollArea()
-        scroll.setWidget(left)
-        scroll.setWidgetResizable(True)
-        scroll.setFixedWidth(292)
-        scroll.setFrameShape(QFrame.NoFrame)
-
         right = QWidget()
         right_layout = QVBoxLayout(right)
         right_layout.setContentsMargins(0, 0, 0, 0)
@@ -129,12 +121,7 @@ class MainWindow(QMainWindow):
         right_layout.addWidget(self.canvas, stretch=1)
         right_layout.addWidget(self._build_results_panel())
 
-        root.addWidget(scroll)
-        divider = QFrame()
-        divider.setFrameShape(QFrame.VLine)
-        divider.setFrameShadow(QFrame.Sunken)
-        root.addWidget(divider)
-        root.addWidget(right, stretch=1)
+        root.addWidget(controls_beside(left, right), stretch=1)
 
         self.tabs.addTab(central, "Analysis")
 

{gratinglab-0.2.2 → gratinglab-0.2.3}/src/gratinglab/metrology/gui/qt/swath_dialog.py

@@ -23,7 +23,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
 
 from ...boundary import swath_statistics
 from ...config import RESULTS_DIR
@@ -144,7 +144,8 @@ class SwathDialog(QDialog):
         shapes.plot(s.t, s.whole.y_norm, color=theming.current().ink, lw=1.4, ls="--", label="whole scan")
         shapes.set_xlabel("position (fraction of period)")
         shapes.set_ylabel("height (fraction of period)")
-        shapes.set_title(f"{s.n_swaths} swaths, coloured top to bottom of the scan")
+        set_titles(shapes, "Groove shape by swath",
+                   f"{s.n_swaths} swaths, coloured top to bottom", theming.current())
         shapes.legend(loc="best", fontsize=8)
 
         centre = [(a + b - 1) / 2 for a, b in s.row_ranges]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gratinglab
-Version: 0.2.2
+Version: 0.2.3
 Summary: Open platform for diffraction grating groove metrology and efficiency analysis
 Author: Jake McCoy, Aditi Gangadharan
 License: BSD-3-Clause

{gratinglab-0.2.2 → gratinglab-0.2.3}/src/gratinglab.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ src/gratinglab/metrology/gui/qt/boundary_view.py
 src/gratinglab/metrology/gui/qt/canvas.py
 src/gratinglab/metrology/gui/qt/efficiency_dialog.py
 src/gratinglab/metrology/gui/qt/import_view.py
+src/gratinglab/metrology/gui/qt/layout.py
 src/gratinglab/metrology/gui/qt/main_window.py
 src/gratinglab/metrology/gui/qt/swath_dialog.py
 src/gratinglab/metrology/gui/qt/wiki_view.py