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

Replace tasksubmitter with action-button

Browse source 
I've changed tasksubmitter to accept a "thing" and "action" rather than a single URL. This seems more in keeping with
propertyControl, and eliminates the need for loads of
computed properties.

I've also deleted (rather than just commenting out) chunks of the web app that are no longer in use. These may be
reinstated in the future - but we can get them from git
history. It's less confusing not to have vestigial
code in the repo.

This builds OK but is not, as yet, tested with hardware.
This commit is contained in:
Richard Bowman 2024-02-29 21:44:39 +00:00
parent 612b88d58c
commit cbd8b090ec
22 changed files with 225 additions and 2325 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
View file

@ -2,14 +2,15 @@
<div id="CSMCalibrationSettings">
<!--Show auto calibrate if default plugin is enabled-->
<div v-if="'calibrate_xy' in actions" class="uk-margin-small">
<taskSubmitter
<action-button
:button-primary="true"
:can-terminate="true"
:requires-confirmation="true"
:confirmation-message="
'Start recalibration of the stage to the camera? This may take a while, and the microscope will be locked during this time.'
"
:submit-url="calibrateXYUri"
thing="camera_stage_mapper"
action="calibrate_xy"
:submit-label="'Auto-Calibrate using camera'"
:modal-progress="true"
@response="onRecalibrateResponse"
@ -29,14 +30,14 @@
</template>
<script>
import taskSubmitter from "../../../genericComponents/taskSubmitter";
import ActionButton from "../../../labThingsComponents/actionButton.vue";
// Export main app
export default {
name: "CSMCalibrationSettings",
components: {
taskSubmitter
ActionButton
},
props: {
@ -55,9 +56,6 @@ export default {
properties() {
return this.$store.getters["wot/thingDescription"]("camera_stage_mapping")
.properties;
},
calibrateXYUri() {
return this.thingActionUrl("camera_stage_mapping", "calibrate_xy");
}
},

84
webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue
View file

@ -2,55 +2,55 @@
<div>
<!--Show auto calibrate if default plugin is enabled-->
<div v-if="'full_auto_calibrate' in actions" class="uk-margin-small">
<taskSubmitter
<action-button
:can-terminate="false"
:requires-confirmation="true"
:confirmation-message="
'Start recalibration? This may take a while, and the microscope will be locked during this time.'
"
:submit-url="cameraUri + 'full_auto_calibrate'"
thing="camera"
action="full_auto_calibrate"
:submit-label="'Full Auto-Calibrate'"
@response="onRecalibrateResponse"
@error="modalError"
>
</taskSubmitter>
/>
</div>
<div v-if="'auto_expose_from_minimum' in actions" class="uk-margin-small">
<taskSubmitter
<action-button
:can-terminate="false"
:requires-confirmation="false"
:submit-url="cameraUri + 'auto_expose_from_minimum'"
thing="camera"
action="auto_expose_from_minimum"
:submit-label="'Auto gain &amp; shutter speed'"
@response="onRecalibrateResponse"
@error="modalError"
>
</taskSubmitter>
/>
</div>
<div v-if="'calibrate_white_balance' in actions" class="uk-margin-small">
<taskSubmitter
<action-button
:can-terminate="false"
:requires-confirmation="false"
:submit-url="cameraUri + 'calibrate_white_balance'"
thing="camera"
action="calibrate_white_balance"
:submit-label="'Auto white balance'"
@response="onRecalibrateResponse"
@error="modalError"
>
</taskSubmitter>
/>
</div>
<div v-if="'calibrate_lens_shading' in actions" class="uk-margin-small">
<taskSubmitter
<action-button
:can-terminate="false"
:requires-confirmation="true"
:confirmation-message="
'Is the microscope looking at an evenly illuminated, empty field of view? ' +
'If not, the current image will show through in any images captured afterwards.'
"
:submit-url="cameraUri + 'calibrate_lens_shading'"
thing="camera"
action="calibrate_lens_shading"
:submit-label="'Auto flat field correction'"
@response="onRecalibrateResponse"
@error="modalError"
>
</taskSubmitter>
/>
</div>
<div
@ -58,44 +58,43 @@
v-if="'flatten_lens_shading_table' in actions"
class="uk-child-width-expand"
>
<taskSubmitter
<action-button
:can-terminate="false"
:requires-confirmation="false"
:submit-url="cameraUri + 'flat_lens_shading'"
thing="camera"
action="flat_lens_shading"
:submit-label="'Disable flat field correction'"
@response="onRecalibrateResponse"
@error="modalError"
>
</taskSubmitter>
/>
</div>
<div
v-show="showExtraSettings"
v-if="'reset_lens_shading' in actions"
class="uk-child-width-expand"
>
<taskSubmitter
<action-button
:can-terminate="false"
:requires-confirmation="false"
:submit-url="cameraUri + 'reset_lens_shading'"
thing="camera"
action="reset_lens_shading"
:submit-label="'Reset flat field correction'"
@response="onRecalibrateResponse"
@error="modalError"
>
</taskSubmitter>
/>
</div>
</div>
</template>
<script>
import axios from "axios";
import taskSubmitter from "../../../genericComponents/taskSubmitter";
import ActionButton from "../../../labThingsComponents/actionButton.vue";
// Export main app
export default {
name: "CameraCalibrationSettings",
components: {
taskSubmitter
ActionButton
},
props: {
@ -110,38 +109,15 @@ export default {
}
},
data: function() {
return {
actions: {},
isCalibrating: false,
LstDownloadEnabled: false
};
},
mounted() {
this.updateActions();
computed: {
actions() {
return this.$store.getters["wot/thingDescription"]("camera").actions;
}
},
methods: {
updateActions: async function() {
try {
let response = await axios.get(this.cameraUri); // Get the thing description
let td = response.data;
this.actions = td.actions;
} catch (error) {
this.modalError(error); // Let mixin handle error
}
},
onRecalibrateResponse: function() {
this.modalNotify("Finished recalibration.");
},
flattenLensShadingTableRequest: function() {
axios.post(this.recalibrationLinks.flatten_lens_shading_table.href);
},
deleteLensShadingTableRequest: function() {
axios.post(this.recalibrationLinks.delete_lens_shading_table.href);
}
}
};