Configuration files and other tweaks

The OFM server can now be run in "stub" mode on
my development machine, using an OpenCV
camera feed.
This commit is contained in:
Richard Bowman 2024-08-09 02:42:32 +01:00
parent 2268425bf3
commit 7fb4417ebe
4 changed files with 15 additions and 5 deletions

1
.gitignore vendored
View file

@ -79,6 +79,7 @@ openflexure_microscope/cobertura.xml
# labthings settings # labthings settings
/settings/ /settings/
/openflexure_settings/
# web app build # web app build
/src/openflexure_microscope_server/static/ /src/openflexure_microscope_server/static/

View file

@ -8,13 +8,12 @@
"/system_control/": "openflexure_microscope_server.things.system_control:SystemControlThing", "/system_control/": "openflexure_microscope_server.things.system_control:SystemControlThing",
"/settings/": "openflexure_microscope_server.things.settings_manager:SettingsManager", "/settings/": "openflexure_microscope_server.things.settings_manager:SettingsManager",
"/smart_scan/": { "/smart_scan/": {
"class": "openflexure_microscope_server.things.smart_scan:SmartScan", "class": "openflexure_microscope_server.things.smart_scan:SmartScanThing",
"kwargs": { "kwargs": {
"path_to_openflexure_stitch": "application/openflexure-stitching/.venv/bin/openflexure-stitch" "path_to_openflexure_stitch": "application/openflexure-stitching/.venv/bin/openflexure-stitch"
} }
}, },
"/background_detect/": "openflexure_microscope_server.things.smart_scan:BackgroundDetectThing", "/background_detect/": "openflexure_microscope_server.things.smart_scan:BackgroundDetectThing",
"/api_test/": "openflexure_microscope_server.things.test:APITestThing"
}, },
"settings_folder": "./openflexure_settings/" "settings_folder": "./openflexure_settings/"
} }

View file

@ -1,10 +1,19 @@
{ {
"things": { "things": {
"/camera/": "openflexure_microscope_server.things.opencv_camera:OpenCVCamera", "/camera/": "openflexure_microscope_server.things.camera.opencv:OpenCVCamera",
"/stage/": "openflexure_microscope_server.things.dummy_stage:DummyStage", "/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", "/system_control/": "openflexure_microscope_server.things.system_control:SystemControlThing",
"/settings/": "openflexure_microscope_server.things.settings_manager:SettingsManager", "/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" "/api_test/": "openflexure_microscope_server.things.test:APITestThing"
}, },
"settings_folder": "./openflexure_settings/" "settings_folder": "./openflexure_settings/"

View file

@ -22,6 +22,7 @@ dependencies = [
"piexif", "piexif",
"scipy ~= 1.6", "scipy ~= 1.6",
"opencv-python ~= 4.7.0", "opencv-python ~= 4.7.0",
"pillow ~= 10.4",
"anyio ~= 4.0", "anyio ~= 4.0",
] ]