Commit 04985e3e authored by Joel Collins's avatar Joel Collins
Browse files

Improved handling updating local settings

parent 3142c9a3

src/components/controlComponents/settingsComponents/cameraSettings.vue

+5 −6
Original line number Diff line number Diff line
@@ -158,11 +158,9 @@ export default { 
          return new Promise(r => setTimeout(r, 500));

        }) // why is there no built-in for this??!

        .then(() => {

          return this.$store.dispatch("updateConfig");

        })

        .then(this.updateInputValues)

        .then(() => {

          console.log("Updated Config: ", payload);

          // Update local settings

          this.updateSettings();

          this.modalNotify("Camera settings applied.");

        })

        .catch(error => {

          this.modalError(error); // Let mixin handle error
@@ -171,7 +169,8 @@ export default { 


    onRecalibrateResponse: function() {

      this.modalNotify("Finished recalibration.");

      return new Promise(r => setTimeout(r, 500)); // wait 500ms before updating config, so it's fresh

      // Update local settings

      this.updateSettings();

    },



    onRecalibrateError: function(error) {

src/components/controlComponents/settingsComponents/microscopeSettings.vue

+2 −1
Original line number Diff line number Diff line
@@ -116,8 +116,9 @@ export default { 
      axios

        .put(this.settingsUri, payload)

        .then(() => {

          // Update local settings

          this.updateSettings();

          this.modalNotify("Microscope config applied.");

          this.modalNotify("Microscope settings applied.");

        })

        .catch(error => {

          this.modalError(error); // Let mixin handle error