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

Implemented click-to-move

Browse source
This commit is contained in:
Joel Collins 2018-11-09 14:43:56 +00:00
parent 59136b8b12
commit d3eb8bb773
1 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
</head> </head>
<body> <body>
<h1>OpenFlexure Microscope API Demo</h1> <h1>OpenFlexure Microscope API Demo</h1>
<img src="{{ url_for('stream') }}"> <img src="{{ url_for('stream') }}" ondblclick="clickHotspotImage(event)";>
<br> <br>
x: <input type="number" id="x_abs"> x: <input type="number" id="x_abs">
@ -16,19 +16,24 @@
Velocity: Velocity:
<br> <br>
x-y: <input type="range" name="stageVelocityInput" min="50" max="200" value="100" oninput="updateStageVelocity(this.value);"> x-y: <input type="range" name="stageVelocityInput" min="50" max="200" value="100" oninput="stageVelocity = Number(this.value);">
<input type="text" id="stageVelocityText" value="100" size="3" disabled> <input type="text" id="stageVelocityText" value="100" size="3" disabled>
z: <input type="range" name="focusVelocityInput" min="10" max="100" value="20" oninput="updateFocusVelocity(this.value);"> z: <input type="range" name="focusVelocityInput" min="10" max="100" value="20" oninput="focusVelocity = Number(this.value);">
<input type="text" id="focusVelocityText" value="20" size="3" disabled> <input type="text" id="focusVelocityText" value="20" size="3" disabled>
<br> <br>
Scroll focus: <input type="checkbox" id="scrollFocusCheck" checked> Scroll focus: <input type="checkbox" id="scrollFocusCheck" checked>
<br>
Click position: <input type="checkbox" id="clickPositionCheck" checked>
x FOV: <input type="text" id="fovXText" value="4100" size="4" onchange="fovX = Number(this.value);">
y FOV: <input type="text" id="fovYText" value="3146" size="4" onchange="fovY = Number(this.value);">
</body> </body>
<script> <script>
// TODO: Mouse wheel to focus?
// TODO: Remember a position and restore that position // TODO: Remember a position and restore that position
// Key IDs // Key IDs
@ -50,21 +55,15 @@
var requestLock = false; var requestLock = false;
// Microscope client-side callibration
//TODO: Move to serverside microscope property
var fovX = 4100;
var fovY = 3146;
window.onload = function() { window.onload = function() {
getStagePositions() getStagePositions()
} }
// Methods for updating page content
function updateStageVelocity(val) {
document.getElementById('stageVelocityText').value = val;
stageVelocity = val;
}
function updateFocusVelocity(val) {
document.getElementById('focusVelocityText').value = val;
focusVelocity = val;
}
function updateStagePositions(response) { function updateStagePositions(response) {
document.getElementById('x_abs').value = response["x"]; document.getElementById('x_abs').value = response["x"];
document.getElementById('y_abs').value = response["y"]; document.getElementById('y_abs').value = response["y"];
@ -91,6 +90,18 @@
safeRequest("POST", "{{ url_for('position') }}", { "absolute": true, "x": x_abs, "y": y_abs, "z": z_abs}, absMoveCallback) safeRequest("POST", "{{ url_for('position') }}", { "absolute": true, "x": x_abs, "y": y_abs, "z": z_abs}, absMoveCallback)
} }
function moveStagePositions(x_rel, y_rel, z_rel) {
// Make a position request
function relMoveCallback(response, status) {
if (status == 400) {
alert("Stage cannot be moved further than the safe range.");
}
console.log(status, response);
updateStagePositions(response);
}
safeRequest("POST", "{{ url_for('position') }}", { "absolute": false, "x": x_rel, "y": y_rel, "z": z_rel}, relMoveCallback)
}
function setStagePositionsFromInput() { function setStagePositionsFromInput() {
x_abs = Number(document.getElementById('x_abs').value); x_abs = Number(document.getElementById('x_abs').value);
y_abs = Number(document.getElementById('y_abs').value); y_abs = Number(document.getElementById('y_abs').value);
@ -105,6 +116,20 @@
} }
// Methods for input events // Methods for input events
function clickHotspotImage(event) {
xCoordinate = event.offsetX;
yCoordinate = event.offsetY;
console.log(xCoordinate, yCoordinate)
xRelative = (0.5*event.target.offsetWidth - xCoordinate)/event.target.offsetWidth;
yRelative = (0.5*event.target.offsetHeight - yCoordinate)/event.target.offsetHeight;
console.log(xRelative, yRelative)
xSteps = xRelative * fovX;
ySteps = yRelative * fovY;
console.log(xSteps, ySteps, 0)
moveStagePositions(xSteps, ySteps, 0)
}
addEventListener("keydown", function (e) { addEventListener("keydown", function (e) {
keysDown[e.keyCode] = true; //Add key to array keysDown[e.keyCode] = true; //Add key to array
console.log(keysDown) console.log(keysDown)
@ -135,7 +160,7 @@
} }
// Make a position request // Make a position request
safeRequest("POST", "{{ url_for('position') }}", { "absolute": false, "x": x_rel, "y": y_rel, "z": z_rel}, keyMoveCallback) moveStagePositions(x_rel, y_rel, z_rel)
} }
}, false); }, false);