From 8318d9daad1397b6a33da7d77282d3c5893bb344 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Fri, 23 May 2025 11:45:16 +0100 Subject: [PATCH 1/2] Fix bug where View pane isn't loaded when app is first opened --- webapp/src/components/appContent.vue | 10 +++++----- webapp/src/components/genericComponents/tabIcon.vue | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/webapp/src/components/appContent.vue b/webapp/src/components/appContent.vue index bc292f88..7322b224 100644 --- a/webapp/src/components/appContent.vue +++ b/webapp/src/components/appContent.vue @@ -212,27 +212,27 @@ export default { topTabs: function() { let tabs = [ { - id: "View", + id: "view", icon: "visibility", component: viewContent }, { - id: "Navigate", + id: "navigate", icon: "gamepad", component: navigateContent }, { - id: "Background Detect", + id: "background detect", icon: "background_replace", component: backgroundDetectContent }, { - id: "Slide Scan", + id: "slide scan", icon: "settings_overscan", component: slideScanContent }, { - id: "Scan List", + id: "scan list", icon: "photo_library", component: ScanListContent } diff --git a/webapp/src/components/genericComponents/tabIcon.vue b/webapp/src/components/genericComponents/tabIcon.vue index 45ef17e3..6482e68c 100644 --- a/webapp/src/components/genericComponents/tabIcon.vue +++ b/webapp/src/components/genericComponents/tabIcon.vue @@ -103,6 +103,7 @@ export default { overflow: hidden; text-overflow: ellipsis; font-size: 85%; + text-transform: capitalize; } a:hover, From 70f4304b2efac5955d3e8a6cc62ab797e7b768f8 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Fri, 23 May 2025 11:45:26 +0100 Subject: [PATCH 2/2] Fix bug where .jpg files are not counted in scan list (only .jpeg) --- src/openflexure_microscope_server/things/smart_scan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openflexure_microscope_server/things/smart_scan.py b/src/openflexure_microscope_server/things/smart_scan.py index 3f11a7e7..e8517748 100644 --- a/src/openflexure_microscope_server/things/smart_scan.py +++ b/src/openflexure_microscope_server/things/smart_scan.py @@ -40,7 +40,7 @@ BackgroundDep = direct_thing_client_dependency( BackgroundDetectThing, "/background_detect/" ) -IMAGE_REGEX = re.compile(r"-?[0-9]+_-?[0-9]+\.jpeg$") +IMAGE_REGEX = re.compile(r"-?[0-9]+_-?[0-9]+\.jpe?g$") class NotEnoughFreeSpaceError(IOError):