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

Rearranged settings and added LST download

parent 4d40e81f

openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettings.vue

+15 −2
Original line number Diff line number Diff line 
<template>

  <div id="CSMSettings">

  <div

    id="CSMSettings"

    class="uk-grid uk-grid-divider uk-child-width-expand"

    uk-grid

  >

    <div class="uk-width-large">

      <h3>Camera/stage mapping</h3>

      <p>

        Camera/stage mapping allows the stage to move relative to the camera

        view. This enables functions like click-to-move, and more precise tile

        scans.

      </p>

      <CSMCalibrationSettings />

    </div>

    <div id="mini-stream">

      <miniStreamDisplay />

    </div>
@@ -147,7 +159,8 @@ export default { 
  margin-right: auto;

}

#mini-stream {

  width: 500px;

  min-width: 300px;

  max-width: 600px;

  text-align: center;

  margin-left: auto;

  margin-right: auto;

openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue

+0 −7
Original line number Diff line number Diff line
@@ -167,11 +167,4 @@ export default { 
  margin-left: auto;

  margin-right: auto;

}

#mini-stream {

  width: 500px;

  text-align: center;

  margin-left: auto;

  margin-right: auto;

  margin-top: 50px;

}

</style>

openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/appSettings.vue

+1 −1
Original line number Diff line number Diff line 
<template>

  <div id="appSettings">

  <div id="appSettings" class="uk-width-large">

    <h3>Appearance</h3>

    <p>

      <label>

openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue

+6 −4
Original line number Diff line number Diff line 
<template>

  <div v-if="settings" id="cameraSettings">

    <div>

    <div class="uk-grid uk-grid-divider uk-child-width-expand" uk-grid>

      <div class="uk-width-large">

        <h3>Manual camera settings</h3>

        <form @submit.prevent="applyConfigRequest">

          <div v-if="settings.picamera">
@@ -54,16 +55,16 @@ 
            Apply Settings

          </button>

        </form>

    </div>



    <!--Show auto calibrate if default plugin is enabled-->

        <h3>Automatic calibration</h3>

        <cameraCalibrationSettings></cameraCalibrationSettings>

      </div>



      <div id="mini-stream">

        <miniStreamDisplay />

      </div>

    </div>

  </div>

</template>



<script>
@@ -141,7 +142,8 @@ export default { 


<style lang="less">

#mini-stream {

  width: 500px;

  min-width: 300px;

  max-width: 600px;

  text-align: center;

  margin-left: auto;

  margin-right: auto;

openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue

+33 −6
Original line number Diff line number Diff line
@@ -16,24 +16,31 @@ 
      </taskSubmitter>

    </div>



    <div v-show="showExtraSettings" class="uk-child-width-expand" uk-grid>

      <div v-if="'flatten_lens_shading_table' in recalibrationLinks">

    <div v-show="showExtraSettings" class="uk-child-width-expand">

      <button

        v-if="'flatten_lens_shading_table' in recalibrationLinks"

        class="uk-button uk-button-danger uk-width-1-1"

        @click="flattenLensShadingTableRequest"

      >

        Disable flat-field correction

      </button>

      </div>



      <div v-if="'delete_lens_shading_table' in recalibrationLinks">

      <button

          class="uk-button uk-button-danger uk-width-1-1"

        v-if="'delete_lens_shading_table' in recalibrationLinks"

        class="uk-button uk-button-danger uk-margin-small-top uk-width-1-1"

        @click="deleteLensShadingTableRequest"

      >

        Adaptive flat-field correction

      </button>

    </div>



    <div v-if="LstDownloadEnabled">

      <a

        class="uk-button uk-button-default uk-width-large uk-margin-small-top uk-align-center"

        :href="LstDownloadUri"

        download

        >Download Lens-Shading Table</a

      >

    </div>

  </div>

</template>
@@ -61,18 +68,23 @@ export default { 
  data: function() {

    return {

      recalibrationLinks: {},

      isCalibrating: false

      isCalibrating: false,

      LstDownloadEnabled: false

    };

  },



  computed: {

    pluginsUri: function() {

      return `${this.$store.getters.baseUri}/api/v2/extensions`;

    },

    LstDownloadUri: function() {

      return `${this.$store.getters.baseUri}/api/v2/instrument/camera/lst`;

    }

  },



  mounted() {

    this.updateRecalibrationLinks();

    this.checkLstDownload();

  },



  methods: {
@@ -97,6 +109,21 @@ export default { 
        });

    },



    checkLstDownload: function() {

      axios

        .get(this.LstDownloadUri) // Get a list of plugins

        .then(response => {

          if (response.status === 200) {

            this.LstDownloadEnabled = true;

          } else {

            this.LstDownloadEnabled = false;

          }

        })

        .catch(error => {

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

        });

    },



    onRecalibrateResponse: function() {

      this.modalNotify("Finished recalibration.");

    },