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

Added client option for bayer capture

Browse source
This commit is contained in:
Joel Collins 2019-01-17 10:22:53 +00:00
parent b0d5426f5b
commit cbf709e8d8
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@ function getStagePositions() {
} }
// Capture methods // Capture methods
function newCapture(filename, keep_on_disk, use_video_port, resizeWidth=null, resizeHeight=null) { function newCapture(filename, keep_on_disk, use_video_port, bayer, resizeWidth=null, resizeHeight=null) {
// Make a position request // Make a position request
function newCaptureCallback(response, status) { function newCaptureCallback(response, status) {
if (status != 200) { if (status != 200) {
@ -156,7 +156,8 @@ function newCapture(filename, keep_on_disk, use_video_port, resizeWidth=null, re
payload = { payload = {
"filename": filename, "filename": filename,
"keep_on_disk": keep_on_disk, "keep_on_disk": keep_on_disk,
"use_video_port": use_video_port "use_video_port": use_video_port,
"bayer": bayer
} }
if ((resizeWidth) && (resizeHeight)) { if ((resizeWidth) && (resizeHeight)) {
@ -174,6 +175,8 @@ function newCaptureFromInput() {
captureFilenameInput = document.getElementById('captureFilenameInput'); captureFilenameInput = document.getElementById('captureFilenameInput');
captureKeepOnDiskCheck = document.getElementById('captureKeepOnDiskCheck'); captureKeepOnDiskCheck = document.getElementById('captureKeepOnDiskCheck');
captureFullResolutionCheck = document.getElementById('captureFullResolutionCheck'); captureFullResolutionCheck = document.getElementById('captureFullResolutionCheck');
captureBayerCheck = document.getElementById('captureBayerCheck')
captureResizeCheck = document.getElementById('captureResizeCheck'); captureResizeCheck = document.getElementById('captureResizeCheck');
captureWidthInput = document.getElementById('captureWidthInput') captureWidthInput = document.getElementById('captureWidthInput')
captureHeightInput = document.getElementById('captureHeightInput') captureHeightInput = document.getElementById('captureHeightInput')
@ -195,7 +198,14 @@ function newCaptureFromInput() {
resizeHeight = null; resizeHeight = null;
} }
newCapture(filename, captureKeepOnDiskCheck.checked, !(captureFullResolutionCheck.checked), resizeWidth, resizeHeight); newCapture(
filename,
captureKeepOnDiskCheck.checked,
!(captureFullResolutionCheck.checked),
captureBayerCheck.checked,
resizeWidth,
resizeHeight
);
} }

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

@ -93,6 +93,7 @@
<input type="text" id="captureFilenameInput" placeholder="Leave blank for default"><br> <input type="text" id="captureFilenameInput" placeholder="Leave blank for default"><br>
Store on Pi: <input type="checkbox" id="captureKeepOnDiskCheck"><br> Store on Pi: <input type="checkbox" id="captureKeepOnDiskCheck"><br>
Full resolution: <input type="checkbox" id="captureFullResolutionCheck"><br> Full resolution: <input type="checkbox" id="captureFullResolutionCheck"><br>
Keep raw data: <input type="checkbox" id="captureBayerCheck"><br>
Resize capture: <input type="checkbox" id="captureResizeCheck" onclick="newCaptureResizeToggle(this);"><br> Resize capture: <input type="checkbox" id="captureResizeCheck" onclick="newCaptureResizeToggle(this);"><br>
<input type="number" id="captureWidthInput" value="640" style="width: 7em" disabled> <input type="number" id="captureWidthInput" value="640" style="width: 7em" disabled>
<input type="number" id="captureHeightInput" value="480" style="width: 7em" disabled><br> <input type="number" id="captureHeightInput" value="480" style="width: 7em" disabled><br>