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

Moved setting and getting stage config into root microscope config

Browse source
This commit is contained in:
Joel Collins 2019-01-15 14:28:28 +00:00
parent 55c3014d26
commit 9c488279d2
3 changed files with 19 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

23
openflexure_microscope/microscope.py
View file

@ -12,6 +12,7 @@ from .camera.pi import StreamingCamera
from .plugins import PluginMount
from .config import load_config, save_config, convert_config
from .utilities import axes_to_array
class Microscope(object):
@ -141,13 +142,6 @@ class Microscope(object):
'z': position[2],
}
backlash = self.stage.backlash.tolist()
state['stage']['backlash'] = {
'x': backlash[0],
'y': backlash[1],
'z': backlash[2],
}
# Add camera state
state['camera'] = self.camera.state
@ -160,6 +154,14 @@ class Microscope(object):
# Update camera config params from StreamingCamera object
self._config.update(self.camera.config)
# If attached to a stage
backlash = self.stage.backlash.tolist()
self._config['backlash'] = {
'x': backlash[0],
'y': backlash[1],
'z': backlash[2],
}
return self._config
@config.setter
@ -169,5 +171,12 @@ class Microscope(object):
# Update camera config
self.camera.config = config
# If attached to a stage
if self.stage:
if 'backlash' in config:
# Construct backlash array
backlash = axes_to_array(config['backlash'], ['x', 'y', 'z'], [0, 0, 0])
self.stage.backlash = backlash
# Cache config
self._config.update(config)