doc doc doc

omc3_gui/segment_by_segment/controller.py

@@ -36,7 +36,7 @@ def connect_signals(self):
 
  @Slot()
  def open_measurements(self):
- LOGGER.debug("OpenButton Clicked. Asking for folder paths.")
+ LOGGER.debug("Opening new optics measurement. Asking for folder paths.")
  filenames = OpenDirectoriesDialog(
  parent=self._view,
  caption="Select Optics Folders", 
@@ -48,7 +48,7 @@ def open_measurements(self):
  LOGGER.debug(f"User selected {len(filenames)} files.")
  for filename in filenames:
  self._last_selected_optics_path = filename.parent
- LOGGER.debug(f"User selected: {filename}")
+ LOGGER.debug(f"adding: {filename}")
  optics_measurement = OpticsMeasurement.from_path(filename)
  try:
  loaded_measurements.add_item(optics_measurement)
@@ -57,7 +57,7 @@ def open_measurements(self):
 
  @Slot(OpticsMeasurement)
  def edit_measurement(self, measurement: OpticsMeasurement):
- LOGGER.debug("EditButton Clicked. Opening edit dialog.")
+ LOGGER.debug(f"Opening edit dialog for {measurement.display()}.")
  dialog = OpticsMeasurementDialog(
  parent=self._view,
  optics_measurement=measurement,

omc3_gui/segment_by_segment/measurement_model.py

@@ -43,7 +43,7 @@ def display(self) -> str:
  @classmethod
  def get_label(cls, name: str) -> str:
  try:
- return cls.__dataclass_fields__[name].metadata["display"]
+ return cls.__dataclass_fields__[name].metadata["label"]
  except KeyError:
  return name
 

omc3_gui/segment_by_segment/measurement_view.py

@@ -3,7 +3,7 @@
 from qtpy import QtWidgets
 
 from omc3_gui.segment_by_segment.measurement_model import OpticsMeasurement
-from omc3_gui.utils.dataclass_ui import DataClassUI, FieldUIDef, dataclass_ui_builder
+from omc3_gui.utils.dataclass_ui import DataClassUI, FieldUIDef
 
 TO_BE_DEFINED = Path("to_be_defined")
 
@@ -33,19 +33,19 @@ def __init__(self, parent=None, optics_measurement: OpticsMeasurement = None):
  def _set_size(self, width: int = -1, height: int = -1):
  # Set position to the center of the parent
  parent = self.parent()
- if parent is not None:
- parent_geo = parent.geometry()
- parent_pos = parent.mapToGlobal(parent.pos()) # multiscreen support
- if width >= 0:
- x = parent_pos.x() + parent_geo.width() / 2
- else:
- x = parent_pos.x() + (parent_geo.width() - width) / 2
-
- if height >=0 :
- y = parent_pos.y() + parent_geo.height() / 2
- else:
- y = parent_pos.y() + (parent_geo.height() - height) / 2
- self.move(x, y)
+ # if parent is not None:
+ #  parent_geo = parent.geometry()
+ #  parent_pos = parent.mapToGlobal(parent.pos()) # multiscreen support
+ #  if width >= 0:
+ #  x = parent_pos.x() + parent_geo.width() / 2
+ #  else:
+ #  x = parent_pos.x() + (parent_geo.width() - width) / 2
+
+ #  if height >=0 :
+ #  y = parent_pos.y() + parent_geo.height() / 2
+ #  else:
+ #  y = parent_pos.y() + (parent_geo.height() - height) / 2
+ #  self.move(x, y)
 
  # Set size
  self.resize(width, height)
@@ -58,7 +58,7 @@ def _build_gui(self):
  # A little bit of coupling to the model here, 
  # so if field-names change or are added this needs to be adjusted.
  # But it makes more sense to have this list here than in the model.
- self._dataclass_ui = dataclass_ui_builder(
+ self._dataclass_ui = DataClassUI.build_dataclass_ui(
  field_def=[
  FieldUIDef(name="measurement_dir", editable=False), 
  *(FieldUIDef(name) for name in ("output_dir", "accel", "beam", "year", "ring"))