diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py index 7e77a757..73876ce6 100644 --- a/openflexure_microscope/api/app.py +++ b/openflexure_microscope/api/app.py @@ -129,6 +129,9 @@ labthing.add_view( ) labthing.add_root_link(views.ConfigurationProperty, "instrumentConfiguration") +# Attach stage resources +labthing.add_view(views.StageTypeProperty, "/instrument/stage/type") + # Attach streams resources labthing.add_view(views.MjpegStream, f"/streams/mjpeg") diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue new file mode 100644 index 00000000..faebfd5b --- /dev/null +++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue index 60cd1e0a..4db2a467 100644 --- a/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue +++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue @@ -44,6 +44,19 @@ Camera +
  • + + Stage + +
  • + +
    + +
    +
    + bool: """ Check if a real (non-mock) stage is currently attached. @@ -363,6 +392,7 @@ class Microscope: # Capture to output object logging.info(f"Starting microscope capture {output.file}") + print(output) self.camera.capture( output, use_video_port=use_video_port,