rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

custom scan name from gui

Browse source
This commit is contained in:
Joe Knapper 2024-01-15 17:40:17 +00:00
parent c2f1b591b1
commit e483c3ddfb
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/openflexure_microscope_server/things/smart_scan.py
View file

@ -341,12 +341,12 @@ class SmartScanThing(Thing):
scan_name = self.latest_scan_name scan_name = self.latest_scan_name
return os.path.join(self.scans_folder_path, 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""" """Create a new empty folder, into which we can save scan images"""
if not os.path.exists(self.scans_folder_path): if not os.path.exists(self.scans_folder_path):
os.makedirs(self.scans_folder_path) os.makedirs(self.scans_folder_path)
for j in range(999999): 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): if not os.path.exists(folder_path):
os.makedirs(folder_path) os.makedirs(folder_path)
self._latest_scan_name = os.path.basename(folder_path) self._latest_scan_name = os.path.basename(folder_path)
@ -364,6 +364,7 @@ class SmartScanThing(Thing):
csm: CSMDep, csm: CSMDep,
background_detect: BackgroundDep, background_detect: BackgroundDep,
recentre: RecentreStage, recentre: RecentreStage,
scan_name: Optional[str]
): ):
"""Move the stage to cover an area, taking images that can be tiled together. """Move the stage to cover an area, taking images that can be tiled together.
@ -441,7 +442,7 @@ class SmartScanThing(Thing):
ids = [] ids = []
start_time = time.strftime("%H_%M_%S-%d_%m_%Y") 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") images_folder = os.path.join(scan_folder, "images")
os.mkdir(images_folder) os.mkdir(images_folder)
raw_images_folder = os.path.join(images_folder, "raw") raw_images_folder = os.path.join(images_folder, "raw")

11
webapp/src/components/tabContentComponents/slideScanContent.vue
View file

@ -46,10 +46,20 @@
</div> </div>
</li> </li>
</ul> </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"> <div class="uk-margin">
<taskSubmitter <taskSubmitter
ref="smartScanTaskSubmitter" ref="smartScanTaskSubmitter"
:submit-url="smartScanUri" :submit-url="smartScanUri"
:submit-data="{ scan_name: scan_name }"
submit-label="Start smart scan" submit-label="Start smart scan"
:can-terminate="true" :can-terminate="true"
@taskStarted="startScanning" @taskStarted="startScanning"
@ -125,6 +135,7 @@ export default {
progress: null, progress: null,
log: [], log: [],
lastStitchedImage: null, lastStitchedImage: null,
scan_name: ""
}; };
}, },