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

Raw images and better cancellation

Browse source 
Cancelling a smart scan now resets position to the starting point.

a "raw images" folder now includes images without resampling.
This commit is contained in:
Richard Bowman 2024-01-08 17:25:31 +00:00
parent 26f5b1955e
commit d615522712
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -394,6 +394,8 @@ class SmartScanThing(Thing):
scan_path = self.new_scan_folder() scan_path = self.new_scan_folder()
images_folder = os.path.join(scan_path, "images") images_folder = os.path.join(scan_path, "images")
os.mkdir(images_folder) os.mkdir(images_folder)
raw_images_folder = os.path.join(scan_path, "raw_images")
os.mkdir(raw_images_folder)
logger.info(f"Saving images to {images_folder}") logger.info(f"Saving images to {images_folder}")
try: try:
@ -481,12 +483,14 @@ class SmartScanThing(Thing):
stage.move_absolute(z=int(focused_path[z_index][2])) stage.move_absolute(z=int(focused_path[z_index][2]))
attempts += 1 attempts += 1
name = f"image_{loc[0]}_{loc[1]}.jpg"
# img = Image.open(cam.capture_jpeg(resolution="full").open()) # img = Image.open(cam.capture_jpeg(resolution="full").open())
img = Image.open(cam.capture_jpeg().open()) jpegblob = cam.capture_jpeg(resolution="full")
jpegblob.save(os.path.join(raw_images_folder, name))
img = Image.open(jpegblob.open())
exif = img.info['exif'] exif = img.info['exif']
width, height = img.size width, height = img.size
img = img.resize((int(width*0.5), int(height*0.5))) img = img.resize((int(width*0.5), int(height*0.5)))
name = f"image_{loc[0]}_{loc[1]}.jpg"
logger.info(f"Saving {name} at {stage.position}") logger.info(f"Saving {name} at {stage.position}")
img.save( img.save(
@ -520,7 +524,7 @@ class SmartScanThing(Thing):
os.path.join(scan_path, "images"), "zip", images_folder os.path.join(scan_path, "images"), "zip", images_folder
) )
logger.info("Returning to starting position.") logger.info("Returning to starting position.")
stage.move_absolute(**starting_position) stage.move_absolute(**starting_position, block_cancellation=True)
@thing_property @thing_property
def scans(self) -> list[ScanInfo]: def scans(self) -> list[ScanInfo]: