plotting rdts

Author: JoschD

omc3_gui/plotting/classes.py

@@ -20,7 +20,7 @@ def setVisible(self, visible):
         self.visibilityChanged.emit(visible)
 
 
-class DualPlot(pg.LayoutWidget):
+class DualPlotWidget(pg.LayoutWidget):
 
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)

omc3_gui/plotting/latex_to_html.py

@@ -49,6 +49,11 @@
     r'\Chi': 'Χ',
     r'\Psi': 'Ψ',
     r'\Omega': 'Ω',
+    # Symbols ---
+    r'\pm': '±',
+    r'\times': '×',
+    r'\Re': 'ℜ',
+    r'\Im': 'ℑ',
     # Spacing ---
     r'\quad': ' ',
     r'\;': ' ',
@@ -65,5 +70,6 @@ def latex_to_html_converter(latex_str):
     latex_str = re.sub(r'_(.)', r'<sub>\1</sub>', latex_str)
     latex_str = re.sub(r'\\frac{([^}]*)}{([^}]*)}', r'<sup>\1</sup>/<sub>\2</sub>', latex_str)
     latex_str = re.sub(r'\\left\((.*?)\\right\)', r'(\1)', latex_str)  # Basic parentheses
+    latex_str = re.sub(r'\\left\|(.*?)\\right\|', r'|\1|', latex_str)  # Absolute values
 
     return latex_str

omc3_gui/segment_by_segment/main_controller.py

@@ -37,7 +37,7 @@
 from omc3_gui.ui_components.text_editor import TextEditorDialog
 from omc3_gui.ui_components.threads import BackgroundThread
 from omc3_gui.ui_components.base_classes_cvm import Controller
-from omc3_gui.plotting.classes import DualPlot
+from omc3_gui.plotting.classes import DualPlotWidget
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -103,7 +103,8 @@ def connect_signals(self):
 
         view.sig_table_segments_selected.connect(self.segment_selection_changed)
         view.sig_thread_spinner_double_clicked.connect(self._show_running_tasks)
-    
+
+    # Tasks --------------------------------------------------------------------  
     @Slot()
     def _update_tasks_status(self):
         """ Update the status bar with the number of running tasks. """
@@ -811,6 +812,8 @@ def plot(self, fail_ok: bool = True):
         view: SbSWindow = self._view
         settings: PlotSettings = self.settings.plotting
         definition, widget = view.get_current_tab()
+        
+        self.clear_plots()
 
         if not settings.forward and not settings.backward:
             LOGGER.error("Please enable at least one propagation method to show.")
@@ -835,18 +838,17 @@ def plot(self, fail_ok: bool = True):
                 log_function("Not plotting, segments have different start BPMs (see 'Same Start' in settings).")
                 return
 
-        self.clear_plots()
         plot_segment_data(
             widget=widget, 
-            definition=definition, 
+            definitions=definition, 
             segments=segments_data, 
             settings=settings,
         )
 
     def clear_plots(self):
         """ Clear the plots. """
         view: SbSWindow = self._view
-        widget: DualPlot = view.get_current_tab()[1]
+        widget: DualPlotWidget = view.get_current_tab()[1]
         widget.clear()
 
 # Other ------------------------------------------------------------------------

omc3_gui/segment_by_segment/main_view.py

@@ -7,43 +7,56 @@
 # from omc3_gui.segment_by_segment.segment_by_segment_ui import Ui_main_window
 from __future__ import annotations
 
-from dataclasses import fields
-from functools import partial
 import logging
 from collections.abc import Sequence
+from dataclasses import fields
+from functools import partial
 
-from omc3.definitions.optics import PHASE_COLUMN, BETA_COLUMN, ALPHA_COLUMN, ColumnsAndLabels
+from omc3.definitions.optics import (
+    ALPHA_COLUMN,
+    BETA_COLUMN,
+    DISPERSION_COLUMN,
+    PHASE_COLUMN,
+)
 from qtpy import QtGui, QtWidgets
 from qtpy.QtCore import QItemSelectionModel, QModelIndex, Qt, Signal, Slot
 
-from omc3_gui.plotting.classes import DualPlot
+from omc3_gui.plotting.classes import DualPlotWidget
 from omc3_gui.segment_by_segment.main_model import (
     MeasurementListModel,
     SegmentTableModel,
 )
 from omc3_gui.segment_by_segment.measurement_model import OpticsMeasurement
+from omc3_gui.segment_by_segment.plotting import DualPlotDefinition
 from omc3_gui.segment_by_segment.segment_model import SegmentItemModel
 from omc3_gui.ui_components import colors
-from omc3_gui.utils.counter import HorizontalGridLayoutFiller
-from omc3_gui.utils.iteration_classes import IterClass
-from omc3_gui.ui_components.styles import MONOSPACED_TOOLTIP
 from omc3_gui.ui_components.base_classes_cvm import View
+from omc3_gui.ui_components.styles import MONOSPACED_TOOLTIP
 from omc3_gui.ui_components.widgets import (
-    DefaultButton,
     ChangeButton,
+    DefaultButton,
     OpenButton,
     RemoveButton,
     RunButton,
 )
+from omc3_gui.utils.counter import HorizontalGridLayoutFiller
+from omc3_gui.utils.iteration_classes import IterClass
 
 ItemDataRole = Qt.ItemDataRole
 LOGGER = logging.getLogger(__name__)
 
-class Tabs(IterClass):
-    PHASE: ColumnsAndLabels = PHASE_COLUMN
-    BETA: ColumnsAndLabels = BETA_COLUMN 
-    ALPHA: ColumnsAndLabels = ALPHA_COLUMN 
 
+class Tabs(IterClass):
+    """ Define the Tabs and the things to plot in them. """
+    PHASE: DualPlotDefinition = DualPlotDefinition.generate_xy("Phase", "phase", PHASE_COLUMN)
+    BETA: DualPlotDefinition = DualPlotDefinition.generate_xy("Beta", "beta_phase", BETA_COLUMN) 
+    ALPHA: DualPlotDefinition = DualPlotDefinition.generate_xy("Alpha", "alpha_phase", ALPHA_COLUMN) 
+    DISPERSION: DualPlotDefinition = DualPlotDefinition.generate_xy("Dispersion", "dispersion", DISPERSION_COLUMN)
+    F1001AP: DualPlotDefinition = DualPlotDefinition.generate_amplitude_phase("f1001")
+    F1001RI: DualPlotDefinition = DualPlotDefinition.generate_real_imag("f1001")
+    F1010AP: DualPlotDefinition = DualPlotDefinition.generate_amplitude_phase("f1010")
+    F1010RI: DualPlotDefinition = DualPlotDefinition.generate_real_imag("f1010")
+    
 
 class SbSWindow(View):
     WINDOW_TITLE = "OMC Segment-by-Segment"
@@ -125,7 +138,7 @@ def _handle_tab_changed(self):
         LOGGER.debug("Tab changed.")
         self.sig_tab_changed.emit()
 
-    # GUI-Elements -------------------------------------------------------------
+    # Menu ---------------------------------------------------------------------
     def _add_menus(self):
         # File ---
         file_menu: QtWidgets.QMenu = self.get_action_by_title("File")  # defined in View-class
@@ -212,6 +225,7 @@ def update_menu_settings(self, menu: str, settings: object, names: Sequence[str]
 
             entry.setChecked(getattr(settings, field.name))
 
+    # Build Main UI-------------------------------------------------------------
     def _build_gui(self):
         self._central = QtWidgets.QSplitter(Qt.Horizontal)
 
@@ -331,7 +345,8 @@ def build_segment_buttons():
         def build_tabs_widget():  # --- Right Hand Side
             self._tabs_widget = QtWidgets.QTabWidget()
             for tab in Tabs.values():
-                self._tabs_widget.addTab(DualPlot(), tab.text_label.capitalize())
+                tab: DualPlotDefinition
+                self._tabs_widget.addTab(DualPlotWidget(), tab.name)
             return self._tabs_widget
 
         self._central.addWidget(build_tabs_widget())
@@ -341,8 +356,9 @@ def build_tabs_widget():  # --- Right Hand Side
         self._central.setStretchFactor(1, 3)
 
         self.setCentralWidget(self._central)
-    
-    def get_current_tab(self) -> tuple[ColumnsAndLabels, DualPlot]:
+
+    # Interactors --------------------------------------------------------------
+    def get_current_tab(self) -> tuple[DualPlotDefinition, DualPlotWidget]:
         widget = self._tabs_widget.currentWidget()
         index = self._tabs_widget.currentIndex()
         return list(Tabs.values())[index], widget
@@ -388,6 +404,7 @@ def get_selected_segments(self) -> tuple[SegmentItemModel]:
 
 
 class MeasurementListView(QtWidgets.QListView):
+    """ Defines the view for the measurement list (on the top left). """
 
     def __init__(self):
         super().__init__()
@@ -398,6 +415,7 @@ def __init__(self):
 
 
 class SegmentTableView(QtWidgets.QTableView):
+    """ Defines the view for the segment table (on the bottom left). """
 
     def __init__(self):
         super().__init__()
@@ -425,6 +443,7 @@ def __init__(self):
 
 
 class ColoredItemDelegate(QtWidgets.QStyledItemDelegate):
+    """ Defines an ItemDelegate that uses a custom color for the text. """
 
     COLOR_MAP = {
         MeasurementListModel.ColorIDs.NONE: colors.TEXT_DARK,