From e483c3ddfb852bcd97fd929388fd4e81d08fb2ba Mon Sep 17 00:00:00 2001
From: Joe Knapper <jaknapper@hotmail.com>
Date: Mon, 15 Jan 2024 17:40:17 +0000
Subject: [PATCH] custom scan name from gui

---
 .../things/smart_scan.py                              |  7 ++++---
 .../tabContentComponents/slideScanContent.vue         | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/openflexure_microscope_server/things/smart_scan.py b/src/openflexure_microscope_server/things/smart_scan.py
index 13b42bc0..183c6a90 100644
--- a/src/openflexure_microscope_server/things/smart_scan.py
+++ b/src/openflexure_microscope_server/things/smart_scan.py
@@ -341,12 +341,12 @@ class SmartScanThing(Thing):
             scan_name = self.latest_scan_name
         return os.path.join(self.scans_folder_path, scan_name)
     
-    def new_scan_folder(self) -> str:
+    def new_scan_folder(self, scan_name: Optional[str]="") -> str:
         """Create a new empty folder, into which we can save scan images"""
         if not os.path.exists(self.scans_folder_path):
             os.makedirs(self.scans_folder_path)
         for j in range(999999):
-            folder_path = os.path.join(self.scans_folder_path, f"scan_{j:06}")
+            folder_path = os.path.join(self.scans_folder_path, f"scan_{scan_name}{j:06}")
             if not os.path.exists(folder_path):
                 os.makedirs(folder_path)
                 self._latest_scan_name = os.path.basename(folder_path)
@@ -364,6 +364,7 @@ class SmartScanThing(Thing):
         csm: CSMDep,
         background_detect: BackgroundDep,
         recentre: RecentreStage,
+        scan_name: Optional[str]
     ):
         """Move the stage to cover an area, taking images that can be tiled together.
 
@@ -441,7 +442,7 @@ class SmartScanThing(Thing):
             ids = []
             start_time = time.strftime("%H_%M_%S-%d_%m_%Y")
 
-            scan_folder = self.new_scan_folder()
+            scan_folder = self.new_scan_folder(scan_name)
             images_folder = os.path.join(scan_folder, "images")
             os.mkdir(images_folder)
             raw_images_folder = os.path.join(images_folder, "raw")
diff --git a/webapp/src/components/tabContentComponents/slideScanContent.vue b/webapp/src/components/tabContentComponents/slideScanContent.vue
index 8e09623d..91ee6b80 100644
--- a/webapp/src/components/tabContentComponents/slideScanContent.vue
+++ b/webapp/src/components/tabContentComponents/slideScanContent.vue
@@ -46,10 +46,20 @@
             </div>
           </li>
         </ul>
+        <label class="uk-form-label" for="form-stacked-text">Sample ID</label>
+        <div class="uk-form-controls">
+          <input
+            v-model="scan_name"
+            class="uk-input uk-form-small"
+            type="text"
+            name="Scan Name"
+          />
+        </div>
         <div class="uk-margin">
           <taskSubmitter
             ref="smartScanTaskSubmitter"
             :submit-url="smartScanUri"
+            :submit-data="{ scan_name: scan_name }"
             submit-label="Start smart scan"
             :can-terminate="true"
             @taskStarted="startScanning"
@@ -125,6 +135,7 @@ export default {
       progress: null,
       log: [],
       lastStitchedImage: null,
+      scan_name: ""
     };
   },