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

Enable web UI to run when no stage is connected

Browse source
This commit is contained in:
Joel Collins 2019-01-22 14:47:11 +00:00
parent a6332f4f30
commit 0dff9b6b39
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/api/templates/index_v1.html
View file

@ -26,7 +26,7 @@
</p>
<p>
<button type="button" onclick="setStagePositionsFromInput();">GO</button>
<button type="button" onclick="getStagePositions();">Update</button>
<button type="button" onclick="api.getState(updateStateValues);">Update</button>
</p>
<p>

6
openflexure_microscope/api/v1/blueprints/stage.py
View file

@ -67,7 +67,7 @@ class PositionAPI(MicroscopeView):
position = [0, 0, 0]
# Handle absolute positioning (calculate a relative move from current position and target)
if payload.param('absolute') is True:
if (payload.param('absolute') is True) and (self.microscope.stage): # Only if stage exists
target_position = axes_to_array(payload.json, ['x', 'y', 'z'])
logging.debug("TARGET: {}".format(target_position))
position = [target_position[i] - self.microscope.stage.position[i] for i in range(3)]
@ -79,7 +79,9 @@ class PositionAPI(MicroscopeView):
logging.debug(position)
self.microscope.stage.move_rel(position)
# Move if stage exists
if self.microscope.stage:
self.microscope.stage.move_rel(position)
out = filter_dict(self.microscope.state, ('stage', 'position'))