From 980e64397da9bbf50988463ff5ceb4ce0839bd4e Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Thu, 28 Mar 2019 17:34:50 +0000
Subject: [PATCH] Improved scan metadata

---
 .../plugins/default/scan/plugin.py              | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/openflexure_microscope/plugins/default/scan/plugin.py b/openflexure_microscope/plugins/default/scan/plugin.py
index ffe2921e..efa8dc5f 100644
--- a/openflexure_microscope/plugins/default/scan/plugin.py
+++ b/openflexure_microscope/plugins/default/scan/plugin.py
@@ -79,12 +79,13 @@ class ScanPlugin(MicroscopePlugin):
             bayer=bayer)
 
         # Affix metadata
-        if 'stack' not in tags:
-            tags.append('stack')
+        if 'scan' not in tags:
+            tags.append('scan')
 
         metadata.update({
-            'Position': self.microscope.state['stage']['position'],
-            'Stack ID': scan_id
+            'position': self.microscope.state['stage']['position'],
+            'scan_id': scan_id,
+            'basename': basename,
         })
 
         output.put_metadata(metadata)
@@ -113,6 +114,10 @@ class ScanPlugin(MicroscopePlugin):
         # Store initial position
         initial_position = self.microscope.stage.position
 
+        # Add scan metadata
+        if not 'time' in metadata:
+            metadata['time'] = generate_basename()
+
         # Check if autofocus is enabled
         if autofocus_dz and hasattr(self.microscope.plugin, 'default_autofocus'):
             autofocus_enabled = True
@@ -199,6 +204,10 @@ class ScanPlugin(MicroscopePlugin):
         if not scan_id:
             scan_id = uuid.uuid4().hex
 
+        # Add scan metadata
+        if not 'time' in metadata:
+            metadata['time'] = generate_basename()
+
         # Store initial position
         initial_position = self.microscope.stage.position