Commit ee91e118 authored by Joel Collins's avatar Joel Collins
Browse files

Updated API to run with server 1.1.x

parent 2850eecf

src/components/paneSettingsComponents/cameraSettings.vue

+21 −12
Original line number Diff line number Diff line
@@ -4,21 +4,21 @@ 
      <div>

        <label class="uk-form-label" for="form-stacked-text">Exposure time</label>

        <div class="uk-form-controls">

          <input v-model="shutterSpeed" class="uk-input uk-form-small" type="number">

          <input v-model="displayShutterSpeed" class="uk-input uk-form-small" type="number">

        </div>

      </div>



      <div>

        <label class="uk-form-label" for="form-stacked-text">Analogue gain</label>

        <div class="uk-form-controls">

          <input v-model="analogGain" class="uk-input uk-form-small" type="number">

          <input v-model="displayAnalogGain" class="uk-input uk-form-small" type="number" step="0.01">

        </div>

      </div>



      <div>

        <label class="uk-form-label" for="form-stacked-text">Digital gain</label>

        <div class="uk-form-controls">

          <input v-model="digitalGain" class="uk-input uk-form-small" type="number">

          <input v-model="displayDigitalGain" class="uk-input uk-form-small" type="number" step="0.01">

        </div>

      </div>
@@ -47,18 +47,18 @@ export default { 


  data: function () {

    return {

      shutterSpeed: this.$store.state.apiConfig.picamera_settings.shutter_speed,

      analogGain: this.$store.state.apiConfig.picamera_settings.analog_gain || this.$store.state.apiConfig.analog_gain,

      digitalGain: this.$store.state.apiConfig.picamera_settings.digital_gain || this.$store.state.apiConfig.digital_gain,

      shutterSpeed: this.$store.state.apiConfig.camera_settings.picamera_settings.shutter_speed,

      analogGain: this.$store.state.apiConfig.camera_settings.picamera_settings.analog_gain,

      digitalGain: this.$store.state.apiConfig.camera_settings.picamera_settings.digital_gain,

      isCalibrating: false

    }

  },



  methods: {

    updateInputValues: function () {

      this.shutterSpeed = this.$store.state.apiConfig.picamera_settings.shutter_speed

      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.$store.state.apiConfig.analog_gain

      this.shutterSpeed = this.$store.state.apiConfig.camera_settings.picamera_settings.shutter_speed

      this.digitalGain = this.$store.state.apiConfig.camera_settings.picamera_settings.digital_gain

      this.analogGain = this.$store.state.apiConfig.camera_settings.picamera_settings.analog_gain

    },



    applyConfigRequest: function() {
@@ -66,9 +66,9 @@ export default { 
      var payload = {picamera_settings:{}}



      //if (this.shutterSpeed != this.$store.state.apiConfig.picamera_settings.shutter_speed) {

      payload.picamera_settings.shutter_speed = this.shutterSpeed

      payload.analog_gain = this.analogGain

      payload.digital_gain = this.digitalGain

      payload.camera_settings.picamera_settings.shutter_speed = this.shutterSpeed

      payload.camera_settings.picamera_settings.analog_gain = this.analogGain

      payload.camera_settings.picamera_settings.digital_gain = this.digitalGain

      //};



      // Send request
@@ -119,6 +119,15 @@ export default { 
  },



  computed: {

    displayDigitalGain: function () {

      return Number(this.digitalGain).toFixed(2)

    },

    displayAnalogGain: function () {

      return Number(this.analogGain).toFixed(2)

    },

    displayShutterSpeed: function () {

      return (this.shutterSpeed != 0) ? this.shutterSpeed : "auto"

    },

    recalibrateApiUri: function () {

      return this.$store.getters.uri + "/plugin/default/camera_calibration/recalibrate"

    },

src/components/paneSettingsComponents/microscopeSettings.vue

+4 −4
Original line number Diff line number Diff line
@@ -52,14 +52,14 @@ export default { 
  data: function () {

    return {

      microscopeName: this.$store.state.apiConfig.name,

      stageBacklash: this.$store.state.apiConfig.backlash

      stageBacklash: this.$store.state.apiConfig.stage_settings.backlash

    }

  },



  methods: {

    updateInputValues: function () {

      this.microscopeName = this.$store.state.apiConfig.name;

      this.stageBacklash = this.$store.state.apiConfig.backlash

      this.stageBacklash = this.$store.state.apiConfig.stage_settings.backlash

    },



    applyConfigRequest: function() {
@@ -69,8 +69,8 @@ export default { 
        payload.name = this.microscopeName

      };



      if (this.stageBacklash != this.$store.state.apiConfig.backlash) {

        payload.backlash = this.stageBacklash

      if (this.stageBacklash != this.$store.state.apiConfig.stage_settings.backlash) {

        payload.stage_settings.backlash = this.stageBacklash

      }



      // Send request to update config