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

Warn about unused settings when updating

Browse source
This commit is contained in:
Joel Collins 2020-11-12 17:04:37 +00:00
parent 3451b8a8a5
commit 1e273beff0
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
openflexure_microscope/microscope.py
View file

@ -200,28 +200,30 @@ class Microscope:
# If attached to a camera # If attached to a camera
if ("camera" in settings) and self.camera: if ("camera" in settings) and self.camera:
self.camera.update_settings(settings.get("camera", {})) self.camera.update_settings(settings.pop("camera", {}))
# If attached to a stage # If attached to a stage
if ("stage" in settings) and self.stage: if ("stage" in settings) and self.stage:
self.stage.update_settings(settings.get("stage", {})) self.stage.update_settings(settings.pop("stage", {}))
# Capture manager # Capture manager
self.captures.update_settings(settings.get("captures", {})) self.captures.update_settings(settings.pop("captures", {}))
# Microscope settings # Microscope settings
if "id" in settings: if "id" in settings:
self.id = settings["id"] self.id = settings.pop("id")
if "name" in settings: if "name" in settings:
self.name = settings["name"] self.name = settings.pop("name")
if "fov" in settings: if "fov" in settings:
self.fov = settings["fov"] self.fov = settings.pop("fov")
# Extension settings # Extension settings
if "extensions" in settings: if "extensions" in settings:
self.extension_settings.update(settings["extensions"]) self.extension_settings.update(settings.pop("extensions"))
# TODO: warn if there are settings that we silently ignore # Warn about any superfluous keys
for key in settings.keys():
logging.warning("Key %s is unused and was ignored", key)
def read_settings(self, full: bool = True): def read_settings(self, full: bool = True):
""" """