bugfixes
This commit is contained in:
1 parent
317e52a1bc
commit
02f60b8de0
2 files changed
+7
-5
No files matched your search
@@ -121,7 +121,7 @@ class ScheduleItemDialog(QDialog):
|
||||
"ic": self._collect_ic_result,
|
||||
"reffoil": self._collect_reffoil_result,
|
||||
"auto_gain": self._collect_auto_gain_result,
|
||||
"temperautre_control": self._collect_temperature_controller_result,
|
||||
"temperature_controller": self._collect_temperature_controller_result,
|
||||
"other": self._collect_custom_result,
|
||||
}
|
||||
|
||||
@@ -542,16 +542,17 @@ class ScheduleItemDialog(QDialog):
|
||||
# ------------------------------------------------------------------ #
|
||||
# Temperature Controller
|
||||
# ------------------------------------------------------------------ #
|
||||
def _build_tempature_controller_page(self):
|
||||
def _build_temperature_controller_page(self):
|
||||
page = QWidget()
|
||||
outer = QVBoxLayout(page)
|
||||
|
||||
scroll = QScrollArea()
|
||||
scroll.setWidgetResizable(True)
|
||||
self.temperature_controller = self.TemperatureController(config_only=True, parent=scroll, client=self._client)
|
||||
self.temperature_controller = self.TemperatureController(config_only=True, parent=scroll)
|
||||
|
||||
scroll.setWidget(self.temperature_controller)
|
||||
outer.addWidget(scroll)
|
||||
outer.addStretch()
|
||||
|
||||
# hint = QLabel(
|
||||
# "Configure the auto-gain functionality, then confirm with Add below - the "
|
||||
@@ -658,7 +659,8 @@ class ScheduleItemDialog(QDialog):
|
||||
self._prefill_reffoil_form(state)
|
||||
elif kind == "custom" and source == "auto_gain" and self._select_page("auto_gain"):
|
||||
self._prefill_auto_gain_form(state)
|
||||
elif kind == "custom" and source == "temperature_controller" and self._select_page("temperature_controller")
|
||||
elif kind == "custom" and source == "temperature_controller" and self._select_page("temperature_controller"):
|
||||
self._prefill_temperature_controller_form(state)
|
||||
elif initial.get("command"):
|
||||
# "custom" kind with no (recognized/available) source, or a
|
||||
# legacy/unrecognized item - fall back to showing the raw
|
||||
|
||||
@@ -153,7 +153,7 @@ def build_item_display_text(item: ScheduleItem, beamline: str | None) -> str:
|
||||
case _:
|
||||
text += (
|
||||
f"Set temperature controller target setpoint to {config['target_setpoint']}"
|
||||
+ f" °C\nwith ramp rate of {config['rampe_rate']} {config['ramp_rate_unit']}"
|
||||
+ f" °C\nwith ramp rate of {config['ramp_rate']} {config['ramp_rate_unit']}"
|
||||
)
|
||||
elif item.command.startswith("dev.abs."):
|
||||
action = item.form_state["action"]
|
||||
|
||||
Reference in new issue
Block a user