diff --git a/src/openflexure_microscope_server/things/scan_workflows.py b/src/openflexure_microscope_server/things/scan_workflows.py index 8fa8361e..6affdecf 100644 --- a/src/openflexure_microscope_server/things/scan_workflows.py +++ b/src/openflexure_microscope_server/things/scan_workflows.py @@ -42,6 +42,7 @@ from openflexure_microscope_server.things.stage import BaseStage from openflexure_microscope_server.ui import ( UI_ELEMENT_RESPONSE, Accordion, + HTMLBlock, UIElementList, property_control_for, ) @@ -562,12 +563,8 @@ class HistoScanWorkflow(RectGridWorkflow[HistoScanSettingsModel]): @lt.endpoint("get", "settings_ui", responses=UI_ELEMENT_RESPONSE) def settings_ui(self) -> UIElementList: """Return the UI for the workflow's settings in the scan tab.""" - return UIElementList( + scan_settings = UIElementList( [ - Accordion( - title="Background Detect", - children=self._background_detector.settings_ui(), - ), property_control_for( self, "overlap", label="Image Overlap (0.1-0.7)", step=0.05 ), @@ -596,6 +593,19 @@ class HistoScanWorkflow(RectGridWorkflow[HistoScanSettingsModel]): ), ] ) + return UIElementList( + [ + HTMLBlock(html=f"

{self.display_name}

{self.ui_blurb}

"), + Accordion( + title="Background Detect", + children=self._background_detector.settings_ui(), + ), + Accordion( + title="Scan Settings", + children=scan_settings, + ), + ] + ) class RegularGridSettingsModel(RectGridSettingsModel): @@ -682,7 +692,7 @@ class RegularGridWorkflow(RectGridWorkflow[RegularGridSettingsModel]): @lt.endpoint("get", "settings_ui", responses=UI_ELEMENT_RESPONSE) def settings_ui(self) -> UIElementList: """Return the UI for the workflow's settings in the scan tab.""" - return UIElementList( + scan_settings = UIElementList( [ property_control_for( self, "overlap", label="Image Overlap (0.1-0.7)", step=0.05 @@ -694,6 +704,15 @@ class RegularGridWorkflow(RectGridWorkflow[RegularGridSettingsModel]): ), ] ) + return UIElementList( + [ + HTMLBlock(html=f"

{self.display_name}

{self.ui_blurb}

"), + Accordion( + title="Scan Settings", + children=scan_settings, + ), + ] + ) class SnakeWorkflow(RegularGridWorkflow): diff --git a/webapp/src/components/tabContentComponents/slideScanContent.vue b/webapp/src/components/tabContentComponents/slideScanContent.vue index 19b6c98e..8dd82d4c 100644 --- a/webapp/src/components/tabContentComponents/slideScanContent.vue +++ b/webapp/src/components/tabContentComponents/slideScanContent.vue @@ -16,17 +16,8 @@ -

- {{ workflowDisplayName }} -

-

{{ workflowBlurb }}

+