settings view

Author: JoschD

omc3_gui/plotting/classes.py

@@ -4,7 +4,6 @@
 
 Containers for figures, plots, etc.
 """
-from dataclasses import dataclass
 import pyqtgraph as pg
 from accwidgets.graph import StaticPlotWidget
 from accwidgets.graph.widgets.plotitem import ExViewBox

omc3_gui/plotting/tfs_plotter.py

@@ -56,8 +56,7 @@ def plot_dataframes(
     """
     plot_item: pg.PlotItem = plot.plotItem
 
-    if legend:
-        plot_item.addLegend(offset=(0, 0))
+    plot_item.addLegend(offset=(0, 0))
 
     for idx, (name, df) in enumerate(dataframes.items()):
         color = pg.Color(get_mpl_color(idx))
@@ -88,6 +87,8 @@ def plot_dataframes(
 
     if ylabel is not None:
         plot_item.setLabel("left", ylabel)
+    
+    plot_item.legend.setVisible(legend)
 
 def plot_errorbar(
     plot: pg.PlotItem,

omc3_gui/segment_by_segment/main_controller.py

@@ -17,7 +17,7 @@
 
 from omc3_gui.segment_by_segment.defaults import DEFAULT_SEGMENTS
 from omc3_gui.segment_by_segment.plotting import plot_segment_data
-from omc3_gui.segment_by_segment.settings_model import PlotSettings, Settings
+from omc3_gui.segment_by_segment.settings import PlotSettings, Settings
 from omc3_gui.segment_by_segment.main_model import SegmentTableModel
 from omc3_gui.segment_by_segment.main_view import SbSWindow
 from omc3_gui.segment_by_segment.measurement_model import OpticsMeasurement
@@ -28,6 +28,7 @@
     compare_segments,
 )
 from omc3_gui.segment_by_segment.segment_view import SegmentDialog
+from omc3_gui.ui_components.dataclass_ui import SettingsDialog
 from omc3_gui.ui_components.file_dialogs import OpenAnySingleDialog, OpenDirectoriesDialog
 from omc3_gui.ui_components.message_boxes import show_confirmation_dialog
 from omc3_gui.ui_components.text_editor import TextEditorDialog
@@ -50,7 +51,7 @@ def __init__(self, settings: Settings | None = None):
         self.connect_signals()
         self.settings: Settings = settings or Settings()
 
-        self._last_selected_optics_path: Path = self.settings.cwd
+        self._last_selected_optics_path: Path = self.settings.main.cwd
         self._running_tasks: list[BackgroundThread] = []
 
         self.set_measurement_interaction_buttons_enabled(False)
@@ -328,7 +329,7 @@ def edit_corrections(self) -> None:
         # Only one or none correction file within the selection measurements from here ---
         if len(correction_files) == 0:  # If there is none, ask user to provide one
             LOGGER.debug("No correction file selected. Asking.")
-            directory = self.settings.cwd
+            directory = self.settings.main.cwd
             if len(selected_measurements) == 1:
                 directory = selected_measurements[0].measurement_dir
 
@@ -650,7 +651,7 @@ def plot(self):
         """ Trigger a plot update with the currently selected segments. """
         view: SbSWindow = self._view
         settings: PlotSettings = self.settings.plotting
-        
+
         segments = view.get_selected_segments()
         if len(segments) != 1:
             LOGGER.error("Please select exactly one segment to plot.")
@@ -660,6 +661,8 @@ def plot(self):
             LOGGER.error("Please enable at least one propagation method to show.")
             return
 
+        self.clear_plots()
+        
         segments_data: list[SegmentDataModel] = segments[0].segments
         definition, widget = view.get_current_tab()
         plot_segment_data(
@@ -679,3 +682,7 @@ def clear_plots(self):
     @Slot()
     def show_settings(self):
         LOGGER.debug("Showing settings.")
+        settings_dialog = SettingsDialog(settings=self.settings)
+        if settings_dialog.exec_():
+            self.plot()
+        

omc3_gui/segment_by_segment/measurement_view.py

@@ -23,14 +23,13 @@ def __init__(self, parent=None, optics_measurement: OpticsMeasurement | None = N
             optics_measurement = OpticsMeasurement(measurement_dir=TO_BE_DEFINED, output_dir=TO_BE_DEFINED)
 
         non_editable = ("measurement_dir", )  # set by program not by user
-        dataclass_ui = DataClassUI.build_dataclass_ui(
+        dataclass_ui = DataClassUI(
             field_definitions=[
                 FieldUIDef(field.name, editable=field.name not in non_editable) 
                 for field in fields(OpticsMeasurement) if field.name[0] != "_"
             ],
-            dclass=OpticsMeasurement,
+            dclass=optics_measurement,
         )
-        dataclass_ui.model = optics_measurement
         super().__init__(dataclass_ui=dataclass_ui, parent=parent)
 
     @property

omc3_gui/segment_by_segment/plotting.py

@@ -9,7 +9,7 @@
 
 from omc3.definitions.optics import ColumnsAndLabels, S_COLUMN
 from omc3_gui.plotting.classes import DualPlot
-from omc3_gui.segment_by_segment.settings_model import PlotSettings
+from omc3_gui.segment_by_segment.settings import PlotSettings
 from omc3_gui.plotting.latex_to_html import latex_to_html_converter
 from omc3_gui.plotting.tfs_plotter import plot_dataframes
 from omc3_gui.segment_by_segment.segment_model import SegmentDataModel
@@ -40,6 +40,9 @@ def plot_segment_data(widget: DualPlot, definition: ColumnsAndLabels, segments:
         column_def = PropagableColumns(plane_def.column, plane="")  # `.column` already contains plane
 
         for direction in ("forward", "backward"):
+            if not getattr(settings, direction):
+                continue
+
             for expected in (None, settings.expected):
                 # note: don't really like the way the following settings are handled, 
                 # but lack a better idea (jdilly, 2025) 

omc3_gui/segment_by_segment/segment_view.py

@@ -21,13 +21,12 @@ def __init__(self, parent=None, segment: SegmentDataModel | None = None):
         if segment is None:
             segment = SegmentDataModel(name=TO_BE_DEFINED, measurement=None)  # dummy
 
-        dataclass_ui = DataClassUI.build_dataclass_ui(
+        dataclass_ui = DataClassUI(
             field_definitions=[
                 FieldUIDef(name) for name in ("name", "start", "end")
             ],
-            dclass=SegmentDataModel,
+            dclass=segment,
         )
-        dataclass_ui.model = segment
         super().__init__(dataclass_ui=dataclass_ui, parent=parent)
 
     @property

omc3_gui/segment_by_segment/settings_model.py renamed to omc3_gui/segment_by_segment/settings.py

@@ -11,18 +11,23 @@
 
 from omc3_gui.ui_components.dataclass_ui import metafield
 
+@dataclass(slots=True)
+class MainSettings:
+    cwd: Path = metafield("Working Directory", "Current working directory. Used for default path when opening file selection dialogs.", default=Path.cwd())
+    # autoload_segments: bool = metafield("Autoload Segments", "Automatically try to load existing segments when loading a measurement.", default=True)  # TODO
+
 
 @dataclass(slots=True)
 class PlotSettings:
-    connect_x: bool = metafield("Connect X", "Connect X axes.", default=False)
-    connect_y: bool = metafield("Connect Y", "Connect Y axes.", default=False)
+    # connect_x: bool = metafield("Connect X", "Connect X axes.", default=False)  # TODO
+    # connect_y: bool = metafield("Connect Y", "Connect Y axes.", default=False)  # TODO
     show_legend: bool = metafield("Show Legend", "Show legend.", default=True)
     forward: bool = metafield("Forward Propagation", "Show forward propagation.", default=True)
     backward: bool = metafield("Backward Propagation", "Show backward propagation.", default=True)
     expected: bool = metafield("Expectation", "Show expected value after correction instead of correction itself.", default=False)
 
+
 @dataclass(slots=True)
 class Settings:
-    cwd: Path = metafield("CWD", "Current working directory.", default=Path.cwd())
-    autoload_segments: bool = metafield("Autoload Segments", "Automatically try to load existing segments when loading a measurement.", default=True)
+    main: MainSettings = field(default_factory=MainSettings)
     plotting: PlotSettings = field(default_factory=PlotSettings)