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

Removed lock timeout for metadata IO

Browse source
This commit is contained in:
Joel Collins 2020-06-25 16:48:30 +01:00
parent 2435842ff6
commit 28ce7fb08b
1 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

90
openflexure_microscope/microscope.py
View file

@ -153,7 +153,7 @@ class Microscope:
Return: Return:
dict: Dictionary containing complete microscope state dict: Dictionary containing complete microscope state
""" """
with self.lock: with self.lock(timeout=None):
state = {"camera": self.camera.state, "stage": self.stage.state} state = {"camera": self.camera.state, "stage": self.stage.state}
return state return state
@ -161,7 +161,7 @@ class Microscope:
""" """
Applies a settings dictionary to the microscope. Missing parameters will be left untouched. Applies a settings dictionary to the microscope. Missing parameters will be left untouched.
""" """
with self.lock: with self.lock(timeout=None):
logging.debug("Microscope: Applying settings: {}".format(settings)) logging.debug("Microscope: Applying settings: {}".format(settings))
# If attached to a camera # If attached to a camera
@ -199,39 +199,38 @@ class Microscope:
This is to ensure that settings for currently disconnected hardware This is to ensure that settings for currently disconnected hardware
don't get removed from the settings file. don't get removed from the settings file.
""" """
with self.lock: settings_current = {
"id": self.id,
settings_current = { "name": self.name,
"id": self.id, "fov": self.fov,
"name": self.name, "extensions": self.extension_settings,
"fov": self.fov, }
"extensions": self.extension_settings,
}
with self.lock(timeout=None):
# If attached to a camera # If attached to a camera
if self.camera: if self.camera:
settings_current_camera = self.camera.read_settings() settings_current_camera = self.camera.read_settings()
settings_current["camera"] = settings_current_camera settings_current["camera"] = settings_current_camera
# Store an encoded copy of the PiCamera lens shading table, if it exists # Store an encoded copy of the PiCamera lens shading table, if it exists
if hasattr(self.camera, "read_lens_shading_table"): if hasattr(self.camera, "read_lens_shading_table"):
# Read LST. Returns None if no LST is active # Read LST. Returns None if no LST is active
lst_arr = self.camera.read_lens_shading_table() lst_arr = self.camera.read_lens_shading_table()
if lst_arr is not None: if lst_arr is not None:
b64_string, dtype, shape = serialise_array_b64(lst_arr) b64_string, dtype, shape = serialise_array_b64(lst_arr)
settings_current["camera"]["lens_shading_table"] = { settings_current["camera"]["lens_shading_table"] = {
"@type": "ndarray", "@type": "ndarray",
"b64_string": b64_string, "b64_string": b64_string,
"dtype": dtype, "dtype": dtype,
"shape": shape, "shape": shape,
} }
# If attached to a stage # If attached to a stage
if self.stage: if self.stage:
settings_current_stage = self.stage.read_settings() settings_current_stage = self.stage.read_settings()
settings_current["stage"] = settings_current_stage settings_current["stage"] = settings_current_stage
# Capture manager # Capture manager
settings_current_captures = self.captures.read_settings() settings_current_captures = self.captures.read_settings()
@ -255,27 +254,28 @@ class Microscope:
@property @property
def configuration(self): def configuration(self):
initial_configuration = self.configuration_file.load() with self.lock(timeout=None):
initial_configuration = self.configuration_file.load()
current_configuration = { current_configuration = {
"application": { "application": {
"name": "openflexure-microscope-server", "name": "openflexure-microscope-server",
"version": pkg_resources.get_distribution( "version": pkg_resources.get_distribution(
"openflexure-microscope-server" "openflexure-microscope-server"
).version, ).version,
}, },
"stage": { "stage": {
"type": self.stage.__class__.__name__, "type": self.stage.__class__.__name__,
**self.stage.configuration, **self.stage.configuration,
}, },
"camera": { "camera": {
"type": self.camera.__class__.__name__, "type": self.camera.__class__.__name__,
**self.camera.configuration, **self.camera.configuration,
}, },
} }
initial_configuration.update(current_configuration) initial_configuration.update(current_configuration)
return initial_configuration return initial_configuration
@property @property
def metadata(self): def metadata(self):