diff --git a/.gitignore b/.gitignore index 820a543a..96c529fd 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ openflexure_microscope/cobertura.xml # labthings settings /settings/ +/openflexure_settings/ # web app build /src/openflexure_microscope_server/static/ \ No newline at end of file diff --git a/ofm_config_full.json b/ofm_config_full.json index 05be1804..471a3a5b 100644 --- a/ofm_config_full.json +++ b/ofm_config_full.json @@ -8,13 +8,12 @@ "/system_control/": "openflexure_microscope_server.things.system_control:SystemControlThing", "/settings/": "openflexure_microscope_server.things.settings_manager:SettingsManager", "/smart_scan/": { - "class": "openflexure_microscope_server.things.smart_scan:SmartScan", + "class": "openflexure_microscope_server.things.smart_scan:SmartScanThing", "kwargs": { "path_to_openflexure_stitch": "application/openflexure-stitching/.venv/bin/openflexure-stitch" } }, "/background_detect/": "openflexure_microscope_server.things.smart_scan:BackgroundDetectThing", - "/api_test/": "openflexure_microscope_server.things.test:APITestThing" }, "settings_folder": "./openflexure_settings/" } \ No newline at end of file diff --git a/ofm_config_stub.json b/ofm_config_stub.json index 7b324974..14aa1d3f 100644 --- a/ofm_config_stub.json +++ b/ofm_config_stub.json @@ -1,10 +1,19 @@ { "things": { - "/camera/": "openflexure_microscope_server.things.opencv_camera:OpenCVCamera", - "/stage/": "openflexure_microscope_server.things.dummy_stage:DummyStage", - + "/camera/": "openflexure_microscope_server.things.camera.opencv:OpenCVCamera", + "/stage/": "openflexure_microscope_server.things.stage.dummy:DummyStage", + "/auto_recentre_stage/": "openflexure_microscope_server.things.auto_recentre_stage:RecentringThing", + "/autofocus/": "openflexure_microscope_server.things.autofocus:AutofocusThing", + "/camera_stage_mapping/": "openflexure_microscope_server.things.camera_stage_mapping:CameraStageMapper", "/system_control/": "openflexure_microscope_server.things.system_control:SystemControlThing", "/settings/": "openflexure_microscope_server.things.settings_manager:SettingsManager", + "/smart_scan/": { + "class": "openflexure_microscope_server.things.smart_scan:SmartScanThing", + "kwargs": { + "path_to_openflexure_stitch": "application/openflexure-stitching/.venv/bin/openflexure-stitch" + } + }, + "/background_detect/": "openflexure_microscope_server.things.smart_scan:BackgroundDetectThing", "/api_test/": "openflexure_microscope_server.things.test:APITestThing" }, "settings_folder": "./openflexure_settings/" diff --git a/pyproject.toml b/pyproject.toml index 71549167..ff333770 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,7 @@ dependencies = [ "piexif", "scipy ~= 1.6", "opencv-python ~= 4.7.0", + "pillow ~= 10.4", "anyio ~= 4.0", ]