Font defaults, dialog behaviour, field properties in a fixed width font

Author: Bryan Lawrence

tests/test_cf_interface.py

@@ -142,6 +142,7 @@ def __init__(self) -> None:
         self.lineplot_calls: list[dict[str, object]] = []
         self.cscale_calls: list[dict[str, object]] = []
         self.gopen_calls: list[dict[str, object]] = []
+        self.setvars_calls: list[dict[str, object]] = []
         self.gclose_calls = 0
 
     def levs(self, **kwargs: object) -> None:
@@ -161,17 +162,24 @@ def gopen(self, file: str = "cfplot.png", **kwargs: object) -> None:
         payload.update(kwargs)
         self.gopen_calls.append(payload)
 
+    def setvars(self, **kwargs: object) -> None:
+        self.setvars_calls.append(kwargs)
+
     def gclose(self) -> None:
         self.gclose_calls += 1
 
 
 class _FakeFigure:
     def __init__(self) -> None:
         self.text_calls: list[tuple[tuple[object, ...], dict[str, object]]] = []
+        self.suptitle_calls: list[tuple[tuple[object, ...], dict[str, object]]] = []
 
     def text(self, *args: object, **kwargs: object) -> None:
         self.text_calls.append((args, kwargs))
 
+    def suptitle(self, *args: object, **kwargs: object) -> None:
+        self.suptitle_calls.append((args, kwargs))
+
 
 class _FakePlt:
     def __init__(self) -> None:
@@ -205,9 +213,43 @@ def test_run_contour_plot_applies_levels_annotations_and_save(
     assert cfp.cscale_calls == [{"scale": "magma"}]
     assert cfp.gopen_calls == [{"file": "/tmp/mock.png"}]
     assert cfp.levs_calls == [{"manual": [-1.0, 0.0, 1.0]}]
+    assert cfp.setvars_calls == [{"title_fontsize": 10.5}]
     assert cfp.con_calls
     assert cfp.gclose_calls == 1
     assert plt_obj.figure.text_calls
+    assert plt_obj.figure.text_calls[-1][1]["fontsize"] == 8.0
+
+
+def test_run_contour_plot_uses_configured_title_font_sizes(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    cfp = _FakeCFPlot()
+    plt_obj = _FakePlt()
+
+    monkeypatch.setattr(cf_interface, "cfp", cfp)
+    monkeypatch.setattr(cf_interface, "plt", plt_obj)
+
+    run_contour_plot(
+        pfld=object(),
+        options={
+            "mode": "default",
+            "page_title": "Overview",
+            "page_title_display": True,
+            "annotation_display": True,
+            "annotation_properties": [("units", "K")],
+            "contour_title_fontsize": 12.5,
+            "page_title_fontsize": 14.0,
+            "annotation_fontsize": 9.5,
+        },
+    )
+
+    assert cfp.setvars_calls == [{"title_fontsize": 12.5}]
+    assert plt_obj.figure.suptitle_calls == [
+        (("Overview",), {"y": 0.995, "fontsize": 14.0})
+    ]
+    assert plt_obj.figure.text_calls == [
+        ((0.5, 0.02, "units: K"), {"ha": "center", "va": "bottom", "fontsize": 9.5})
+    ]
 
 
 def test_run_contour_plot_sets_title_from_singleton_selection(

xconv2/core_window.py

@@ -24,6 +24,7 @@
     QComboBox,
     QDialog,
     QDialogButtonBox,
+    QDoubleSpinBox,
     QFileDialog,
     QGroupBox,
     QHBoxLayout,
@@ -386,6 +387,30 @@ def _visible_coordinate_rows(self, settings: dict[str, object] | None = None) ->
             return raw
         return 4
 
+    def _contour_title_fontsize(self, settings: dict[str, object] | None = None) -> float:
+        """Return validated default contour title font size."""
+        source = settings if settings is not None else self._settings
+        raw = source.get("contour_title_fontsize", 10.5)
+        if isinstance(raw, (int, float)) and float(raw) > 0:
+            return float(raw)
+        return 10.5
+
+    def _page_title_fontsize(self, settings: dict[str, object] | None = None) -> float:
+        """Return validated default page title font size."""
+        source = settings if settings is not None else self._settings
+        raw = source.get("page_title_fontsize", 10.0)
+        if isinstance(raw, (int, float)) and float(raw) > 0:
+            return float(raw)
+        return 10.0
+
+    def _annotation_fontsize(self, settings: dict[str, object] | None = None) -> float:
+        """Return validated default annotation font size."""
+        source = settings if settings is not None else self._settings
+        raw = source.get("annotation_fontsize", 8.0)
+        if isinstance(raw, (int, float)) and float(raw) > 0:
+            return float(raw)
+        return 8.0
+
     @staticmethod
     def _timestamp_plot_filename() -> str:
         """Return default timestamp-based plot filename stem."""
@@ -466,6 +491,39 @@ def _show_settings_dialog(self) -> None:
         coord_rows_row.addStretch(1)
         coord_rows_row.addWidget(coord_rows_spin)
 
+        contour_title_fontsize_row = QHBoxLayout()
+        contour_title_fontsize_label = QLabel("Default contour title font size")
+        contour_title_fontsize_spin = QDoubleSpinBox()
+        contour_title_fontsize_spin.setRange(1.0, 48.0)
+        contour_title_fontsize_spin.setDecimals(1)
+        contour_title_fontsize_spin.setSingleStep(0.5)
+        contour_title_fontsize_spin.setValue(self._contour_title_fontsize())
+        contour_title_fontsize_row.addWidget(contour_title_fontsize_label)
+        contour_title_fontsize_row.addStretch(1)
+        contour_title_fontsize_row.addWidget(contour_title_fontsize_spin)
+
+        page_title_fontsize_row = QHBoxLayout()
+        page_title_fontsize_label = QLabel("Default page title font size")
+        page_title_fontsize_spin = QDoubleSpinBox()
+        page_title_fontsize_spin.setRange(1.0, 48.0)
+        page_title_fontsize_spin.setDecimals(1)
+        page_title_fontsize_spin.setSingleStep(0.5)
+        page_title_fontsize_spin.setValue(self._page_title_fontsize())
+        page_title_fontsize_row.addWidget(page_title_fontsize_label)
+        page_title_fontsize_row.addStretch(1)
+        page_title_fontsize_row.addWidget(page_title_fontsize_spin)
+
+        annotation_fontsize_row = QHBoxLayout()
+        annotation_fontsize_label = QLabel("Default annotation font size")
+        annotation_fontsize_spin = QDoubleSpinBox()
+        annotation_fontsize_spin.setRange(1.0, 48.0)
+        annotation_fontsize_spin.setDecimals(1)
+        annotation_fontsize_spin.setSingleStep(0.5)
+        annotation_fontsize_spin.setValue(self._annotation_fontsize())
+        annotation_fontsize_row.addWidget(annotation_fontsize_label)
+        annotation_fontsize_row.addStretch(1)
+        annotation_fontsize_row.addWidget(annotation_fontsize_spin)
+
         plot_filename_row = QHBoxLayout()
         plot_filename_label = QLabel("Default plot filename")
         plot_filename_edit = QLineEdit(self._plot_filename_template())
@@ -537,6 +595,9 @@ def _choose_plot_dir() -> None:
         gui_defaults_layout.addLayout(recent_row)
         gui_defaults_layout.addLayout(field_rows_row)
         gui_defaults_layout.addLayout(coord_rows_row)
+        gui_defaults_layout.addLayout(contour_title_fontsize_row)
+        gui_defaults_layout.addLayout(page_title_fontsize_row)
+        gui_defaults_layout.addLayout(annotation_fontsize_row)
 
         output_frame = QGroupBox("Output")
         output_layout = QVBoxLayout(output_frame)
@@ -556,6 +617,9 @@ def _choose_plot_dir() -> None:
         self._settings["max_recent_files"] = int(recent_spin.value())
         self._settings["field_list_rows"] = int(field_rows_spin.value())
         self._settings["visible_coordinate_rows"] = int(coord_rows_spin.value())
+        self._settings["contour_title_fontsize"] = float(contour_title_fontsize_spin.value())
+        self._settings["page_title_fontsize"] = float(page_title_fontsize_spin.value())
+        self._settings["annotation_fontsize"] = float(annotation_fontsize_spin.value())
         self._settings["default_plot_filename"] = self._sanitize_plot_filename_stem(
             plot_filename_edit.text()
         )

xconv2/main_window.py

@@ -391,6 +391,11 @@ def _request_plot_task(self, save_code_path: str | None, save_plot_path: str | N
             return
 
         plot_options = dict(self.plot_options_by_kind.get(plot_kind, {}))
+        if plot_kind == "contour":
+            plot_options.setdefault("contour_title_fontsize", self._contour_title_fontsize())
+            plot_options.setdefault("page_title_fontsize", self._page_title_fontsize())
+            plot_options.setdefault("annotation_fontsize", self._annotation_fontsize())
+
         if save_plot_path:
             plot_options["filename"] = str(Path(save_plot_path).expanduser())
         elif not plot_options: