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

Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-software

Browse source
This commit is contained in:
Joel Collins 2018-11-12 13:08:42 +00:00
commit 49331d36a8
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
openflexure_microscope/api/static/main_v1.js
View file

@ -69,6 +69,8 @@ function getStagePositions() {
safeRequest("GET", baseURI+"/position", null, updatePositionCallback, false) safeRequest("GET", baseURI+"/position", null, updatePositionCallback, false)
} }
// TODO: Combine setStagePositions and moveStagePositions, with bool argument for 'absolute'
function setStagePositions(x_abs, y_abs, z_abs) { function setStagePositions(x_abs, y_abs, z_abs) {
// Make a position request // Make a position request
function absMoveCallback(response, status) { function absMoveCallback(response, status) {
@ -145,6 +147,7 @@ addEventListener("keydown", function (e) {
// If not currently in an input box // If not currently in an input box
if (!(e.target instanceof HTMLInputElement)) { if (!(e.target instanceof HTMLInputElement)) {
// TODO: Remove this if condition? Pointless?
// If stage movement keys are pressed // If stage movement keys are pressed
if ((leftKeyID in keysDown) || (rightKeyID in keysDown) || (upKeyID in keysDown) || (downKeyID in keysDown) || (pgupKeyID in keysDown) || (pgdnKeyID in keysDown)) { if ((leftKeyID in keysDown) || (rightKeyID in keysDown) || (upKeyID in keysDown) || (downKeyID in keysDown) || (pgupKeyID in keysDown) || (pgdnKeyID in keysDown)) {
// Calculate movement array // Calculate movement array