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

Manage transition to new camera settings structure

Browse source
This commit is contained in:
Joel Collins 2019-06-04 13:02:58 +01:00
parent f109f76049
commit 1d6ae5c9da
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/paneSettingsComponents/cameraSettings.vue
View file

@ -48,8 +48,8 @@ export default {
data: function () { data: function () {
return { return {
shutterSpeed: this.$store.state.apiConfig.picamera_settings.shutter_speed, shutterSpeed: this.$store.state.apiConfig.picamera_settings.shutter_speed,
analogGain: this.$store.state.apiConfig.picamera_settings.analog_gain, analogGain: this.$store.state.apiConfig.picamera_settings.analog_gain || this.$store.state.apiConfig.analog_gain,
digitalGain: this.$store.state.apiConfig.picamera_settings.digital_gain, digitalGain: this.$store.state.apiConfig.picamera_settings.digital_gain || this.$store.state.apiConfig.digital_gain,
isCalibrating: false isCalibrating: false
} }
}, },
@ -57,8 +57,8 @@ export default {
methods: { methods: {
updateInputValues: function () { updateInputValues: function () {
this.shutterSpeed = this.$store.state.apiConfig.picamera_settings.shutter_speed this.shutterSpeed = this.$store.state.apiConfig.picamera_settings.shutter_speed
this.digitalGain = this.$store.state.apiConfig.picamera_settings.digital_gain this.digitalGain = this.$store.state.apiConfig.picamera_settings.digital_gain || this.$store.state.apiConfig.digital_gain
this.analogGain = this.$store.state.apiConfig.picamera_settings.analog_gain this.analogGain = this.$store.state.apiConfig.picamera_settings.analog_gain || this.$store.state.apiConfig.analog_gain
}, },
applyConfigRequest: function() { applyConfigRequest: function() {
@ -67,8 +67,8 @@ export default {
//if (this.shutterSpeed != this.$store.state.apiConfig.picamera_settings.shutter_speed) { //if (this.shutterSpeed != this.$store.state.apiConfig.picamera_settings.shutter_speed) {
payload.picamera_settings.shutter_speed = this.shutterSpeed payload.picamera_settings.shutter_speed = this.shutterSpeed
payload.picamera_settings.analog_gain = this.analogGain payload.analog_gain = this.analogGain
payload.picamera_settings.digital_gain = this.digitalGain payload.digital_gain = this.digitalGain
//}; //};
// Send request // Send request