From 8c3302644a50c634a628f097ce6a6ab27b33bc00 Mon Sep 17 00:00:00 2001 From: jtc42 Date: Fri, 7 Jun 2019 17:28:57 +0100 Subject: [PATCH] Automatically add microscope ID and name to metadata --- openflexure_microscope/api/v1/blueprints/camera/capture.py | 6 +++++- openflexure_microscope/plugins/default/scan/plugin.py | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/openflexure_microscope/api/v1/blueprints/camera/capture.py b/openflexure_microscope/api/v1/blueprints/camera/capture.py index 029b8c34..3af8ee09 100644 --- a/openflexure_microscope/api/v1/blueprints/camera/capture.py +++ b/openflexure_microscope/api/v1/blueprints/camera/capture.py @@ -127,7 +127,11 @@ class ListAPI(MicroscopeView): resize=resize, bayer=bayer) - metadata.update({'Position': self.microscope.state['stage']['position']}) + metadata.update({ + 'position': self.microscope.state['stage']['position'], + 'microscope_id': self.microscope.id, + 'microscope_name': self.microscope.name + }) output.put_metadata(metadata) output.put_tags(tags) diff --git a/openflexure_microscope/plugins/default/scan/plugin.py b/openflexure_microscope/plugins/default/scan/plugin.py index dbdcbb1f..06bb87a7 100644 --- a/openflexure_microscope/plugins/default/scan/plugin.py +++ b/openflexure_microscope/plugins/default/scan/plugin.py @@ -86,6 +86,8 @@ class ScanPlugin(MicroscopePlugin): 'position': self.microscope.state['stage']['position'], 'scan_id': scan_id, 'basename': basename, + 'microscope_id': self.microscope.id, + 'microscope_name': self.microscope.name }) output.put_metadata(metadata)