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

Add a property to enable/disable auto-stitching

Browse source
This commit is contained in:
Richard Bowman 2024-01-15 21:35:27 +00:00
parent 06bc5f65cb
commit 9ac0a11ce1
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -564,10 +564,11 @@ class SmartScanThing(Thing):
positions.append(loc[:2]) positions.append(loc[:2])
names.append(name) names.append(name)
if not self.preview_stitch_running(): if self.stitch_automatically:
self.preview_stitch_start(images_folder) if not self.preview_stitch_running():
if not self.correlate_running(): self.preview_stitch_start(images_folder)
self.correlate_start(images_folder, overlap=overlap) if not self.correlate_running():
self.correlate_start(images_folder, overlap=overlap)
# add the current position to the list of all positions visited # add the current position to the list of all positions visited
true_path.append(loc) true_path.append(loc)
@ -615,7 +616,7 @@ class SmartScanThing(Thing):
self.correlate_wait() self.correlate_wait()
logger.info("Stitching final image (may take some time)...") logger.info("Stitching final image (may take some time)...")
try: try:
if scan_folder: if scan_folder and self.stitch_automatically:
self.stitch_scan(logger, os.path.basename(scan_folder), overlap=overlap) self.stitch_scan(logger, os.path.basename(scan_folder), overlap=overlap)
except SubprocessError as e: except SubprocessError as e:
logger.exception(f"Stitching failed: {e}") logger.exception(f"Stitching failed: {e}")
@ -663,6 +664,15 @@ class SmartScanThing(Thing):
@overlap.setter @overlap.setter
def overlap(self, value: float) -> None: def overlap(self, value: float) -> None:
self.thing_settings["overlap"] = value self.thing_settings["overlap"] = value
@thing_property
def stitch_automatically(self) -> bool:
"""Should we attempt to stitch scans as we go?"""
return self.thing_settings.get("stitch_automatically", True)
@stitch_automatically.setter
def stitch_automatically(self, value: bool) -> None:
self.thing_settings["stitch_automatically"] = value
@thing_property @thing_property
def scans(self) -> list[ScanInfo]: def scans(self) -> list[ScanInfo]: