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

Hide error from CSM if it's uncalibrated

Browse source 
The error still appears in the console - should be fixed
eventually.
This commit is contained in:
Richard Bowman 2023-12-01 02:31:49 +00:00
parent a31c0aa835
commit f87594e7af
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/components/modalComponents/calibrationModal.vue
View file

@ -201,15 +201,12 @@ export default {
show: async function() {
// Check if the camera and stage are calibrated, if they can be
if (this.canCSMCalibrated) {
try {
let csm = this.readThingProperty(
"camera_stage_mapping",
"image_to_stage_displacement_matrix"
);
this.isCSMCalibrated = Boolean(csm);
} catch {
this.isCSMCalibrated = false;
}
let csm = this.readThingProperty(
"camera_stage_mapping",
"image_to_stage_displacement_matrix",
true
);
this.isCSMCalibrated = Boolean(csm);
}
if (this.canLSTCalibrated) {
this.isLSTCalibrated = this.readThingProperty(

5
webapp/src/main.js
View file

@ -41,7 +41,7 @@ Vue.mixin({
thingAvailable(thing) {
return this.$store.getters["wot/thingAvailable"](thing);
},
async readThingProperty(thing, property) {
async readThingProperty(thing, property, silence_errors = false) {
let url = this.$store.getters["wot/thingPropertyUrl"](
thing,
property,
@ -51,7 +51,8 @@ Vue.mixin({
let response = await axios.get(url);
return response.data;
} catch (error) {
this.modalError(error);
if (!silence_errors) this.modalError(error);
return undefined;
}
},
async writeThingProperty(thing, property, value) {