From 2f6049610f3c5152c3cd2dd6af5101f7f31c2568 Mon Sep 17 00:00:00 2001 From: Richard Bowman Date: Mon, 15 Feb 2021 17:50:39 +0000 Subject: [PATCH] Added controls for AWB gains, I also increased the precision of the numbers, which makes the step buttons annoyingly useless but allows floating point values without validation errors. --- .../settingsComponents/cameraSettings.vue | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue b/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue index 8e37a0b9..67c1fdda 100644 --- a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue +++ b/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue @@ -3,7 +3,7 @@

Manual camera settings

-
+
  • @@ -31,7 +31,7 @@ v-model="picamera.analog_gain" class="uk-input uk-form-small" type="number" - step="0.000001" + step="0.0000000000000001" />
@@ -45,7 +45,29 @@ v-model="picamera.digital_gain" class="uk-input uk-form-small" type="number" - step="0.000001" + step="0.0000000000000001" + /> +
+ + +
+ +
+ + + +
@@ -194,7 +216,8 @@ export default { shutter_speed: undefined, analog_gain: undefined, digital_gain: undefined, - framerate: undefined + framerate: undefined, + awb_gains: undefined }, mjpeg_bitrate: undefined, stream_resolution: undefined, @@ -244,6 +267,7 @@ export default { this.picamera.digital_gain = cameraSettings.picamera.digital_gain; this.picamera.shutter_speed = cameraSettings.picamera.shutter_speed; this.picamera.framerate = cameraSettings.picamera.framerate; + this.picamera.awb_gains = cameraSettings.picamera.awb_gains; } }) .catch(error => { @@ -263,7 +287,11 @@ export default { shutter_speed: parseFloat(this.picamera.shutter_speed), analog_gain: parseFloat(this.picamera.analog_gain), digital_gain: parseFloat(this.picamera.digital_gain), - framerate: parseInt(this.picamera.framerate) + framerate: parseInt(this.picamera.framerate), + awb_gains: [ + parseFloat(this.picamera.awb_gains[0]), + parseFloat(this.picamera.awb_gains[1]), + ], } } };