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

Updated all log strings to new format

Browse source
This commit is contained in:
Joel Collins 2020-11-12 15:12:17 +00:00
parent 36e837d374
commit 9f5252194a
35 changed files with 121 additions and 715 deletions
Download patch file Download diff file Expand all files Collapse all files

18
openflexure_microscope/microscope.py
View file

@ -71,7 +71,7 @@ class Microscope:
def close(self):
"""Shut down the microscope hardware."""
logging.info("Closing {}".format(self))
logging.info("Closing {}", (self))
if self.camera:
try:
self.camera.close()
@ -83,7 +83,7 @@ class Microscope:
except TimeoutError as e:
logging.error(e)
self.captures.close()
logging.info("Closed {}".format(self))
logging.info("Closed {}", (self))
def setup(self, configuration):
"""
@ -196,7 +196,7 @@ class Microscope:
Applies a settings dictionary to the microscope. Missing parameters will be left untouched.
"""
with self.lock:
logging.debug("Microscope: Applying settings: {}".format(settings))
logging.debug("Microscope: Applying settings: {}", (settings))
# If attached to a camera
if ("camera" in settings) and self.camera:
@ -329,14 +329,14 @@ class Microscope:
# Load cached bits of metadata
if cache_key:
logging.debug("Reading cached microscope metadata: %s", cache_key)
logging.debug("Reading cached microscope metadata: {}", cache_key)
metadata = self.metadata_cache.get(cache_key, None)
if not metadata:
logging.debug("Building and caching microscope metadata: %s", cache_key)
logging.debug("Building and caching microscope metadata: {}", cache_key)
metadata = self.force_get_metadata()
self.metadata_cache[cache_key] = metadata
else:
logging.debug("Building microscope metadata: %s", cache_key)
logging.debug("Building microscope metadata: {}", cache_key)
metadata = self.force_get_metadata()
# Keys that should never be cached
@ -362,7 +362,7 @@ class Microscope:
metadata: dict = None,
cache_key: str = None,
):
logging.debug("Microscope capturing to %s", filename)
logging.debug("Microscope capturing to {}", filename)
if not annotations:
annotations = {}
if not metadata:
@ -384,7 +384,7 @@ class Microscope:
extras = {}
if fmt == "jpeg":
extras["thumbnail"] = (*THUMBNAIL_SIZE, 85)
logging.info("Starting microscope capture %s", output.file)
logging.info("Starting microscope capture {}", output.file)
self.camera.capture(
output,
use_video_port=use_video_port,
@ -395,6 +395,6 @@ class Microscope:
)
output.put_and_save(tags, annotations, full_metadata)
logging.debug("Finished capture to %s", output.file)
logging.debug("Finished capture to {}", output.file)
return output