From cbf709e8d8232b220c5ecc946602955e8b5c5d71 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Thu, 17 Jan 2019 10:22:53 +0000 Subject: [PATCH] Added client option for bayer capture --- openflexure_microscope/api/static/main_v1.js | 16 +++++++++++++--- .../api/templates/index_v1.html | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/openflexure_microscope/api/static/main_v1.js b/openflexure_microscope/api/static/main_v1.js index c9514f19..760ef1d7 100644 --- a/openflexure_microscope/api/static/main_v1.js +++ b/openflexure_microscope/api/static/main_v1.js @@ -143,7 +143,7 @@ function getStagePositions() { } // 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 function newCaptureCallback(response, status) { if (status != 200) { @@ -156,7 +156,8 @@ function newCapture(filename, keep_on_disk, use_video_port, resizeWidth=null, re payload = { "filename": filename, "keep_on_disk": keep_on_disk, - "use_video_port": use_video_port + "use_video_port": use_video_port, + "bayer": bayer } if ((resizeWidth) && (resizeHeight)) { @@ -174,6 +175,8 @@ function newCaptureFromInput() { captureFilenameInput = document.getElementById('captureFilenameInput'); captureKeepOnDiskCheck = document.getElementById('captureKeepOnDiskCheck'); captureFullResolutionCheck = document.getElementById('captureFullResolutionCheck'); + captureBayerCheck = document.getElementById('captureBayerCheck') + captureResizeCheck = document.getElementById('captureResizeCheck'); captureWidthInput = document.getElementById('captureWidthInput') captureHeightInput = document.getElementById('captureHeightInput') @@ -195,7 +198,14 @@ function newCaptureFromInput() { resizeHeight = null; } - newCapture(filename, captureKeepOnDiskCheck.checked, !(captureFullResolutionCheck.checked), resizeWidth, resizeHeight); + newCapture( + filename, + captureKeepOnDiskCheck.checked, + !(captureFullResolutionCheck.checked), + captureBayerCheck.checked, + resizeWidth, + resizeHeight + ); } diff --git a/openflexure_microscope/api/templates/index_v1.html b/openflexure_microscope/api/templates/index_v1.html index 42d846a9..249b3862 100644 --- a/openflexure_microscope/api/templates/index_v1.html +++ b/openflexure_microscope/api/templates/index_v1.html @@ -93,6 +93,7 @@
Store on Pi:
Full resolution:
+ Keep raw data:
Resize capture: