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

Linted

Browse source
This commit is contained in:
Richard Bowman 2023-11-02 20:30:54 +00:00
parent 79752a2a4c
commit c5c02eb029
9 changed files with 235 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

11
webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue
View file

@ -221,7 +221,10 @@
</select>
</div>
<div class="uk-margin-small uk-margin-remove-bottom" v-if="backgroundDetectUri">
<div
v-if="backgroundDetectUri"
class="uk-margin-small uk-margin-remove-bottom"
>
<label class="uk-form-label" for="form-stacked-text">
<input
v-model="detectEmptyFieldsAndSkipAutofocus"
@ -475,7 +478,8 @@ export default {
namemode: this.namingStyle.toLowerCase(),
autofocus_dz: afDeltas[this.scanDeltaZ],
fast_autofocus: this.scanDeltaZ == "Fast",
detect_empty_fields_and_skip_autofocus: this.detectEmptyFieldsAndSkipAutofocus
detect_empty_fields_and_skip_autofocus: this
.detectEmptyFieldsAndSkipAutofocus
};
},
smartScanPayload: function() {
@ -568,7 +572,8 @@ export default {
);
if (foundExtension) {
// Get plugin action link
this.backgroundDetectUri = foundExtension.links.grab_and_classify_image.href;
this.backgroundDetectUri =
foundExtension.links.grab_and_classify_image.href;
}
})
.catch(error => {

6
webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue
View file

@ -3,7 +3,7 @@
<div class="uk-grid uk-grid-divider uk-child-width-expand" uk-grid>
<div class="uk-width-large">
<h3>Automatic calibration</h3>
<cameraCalibrationSettings :camera-uri="cameraUri"/>
<cameraCalibrationSettings :camera-uri="cameraUri" />
<h3>Manual camera settings</h3>
<form @submit.prevent="applySettingsRequest">
@ -39,7 +39,7 @@
/>
<NumericArraySettingLine
label="MJPEG stream resolution"
:property-url="cameraUri +'stream_resolution'"
:property-url="cameraUri + 'stream_resolution'"
:read-back-delay="100"
/>
</div>
@ -104,7 +104,7 @@ export default {
miniStreamDisplay,
NumericSettingLine,
NumericArraySettingLine
},
},
data: function() {
return {

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

@ -15,10 +15,7 @@
>
</taskSubmitter>
</div>
<div
v-if="'auto_expose_from_minimum' in actions"
class="uk-margin-small"
>
<div v-if="'auto_expose_from_minimum' in actions" class="uk-margin-small">
<taskSubmitter
:can-terminate="false"
:requires-confirmation="false"
@ -29,10 +26,7 @@
>
</taskSubmitter>
</div>
<div
v-if="'calibrate_white_balance' in actions"
class="uk-margin-small"
>
<div v-if="'calibrate_white_balance' in actions" class="uk-margin-small">
<taskSubmitter
:can-terminate="false"
:requires-confirmation="false"
@ -43,10 +37,7 @@
>
</taskSubmitter>
</div>
<div
v-if="'calibrate_lens_shading' in actions"
class="uk-margin-small"
>
<div v-if="'calibrate_lens_shading' in actions" class="uk-margin-small">
<taskSubmitter
:can-terminate="false"
:requires-confirmation="true"
@ -62,7 +53,7 @@
</taskSubmitter>
</div>
<div
<div
v-show="showExtraSettings"
v-if="'flatten_lens_shading_table' in actions"
class="uk-child-width-expand"
@ -77,11 +68,12 @@
>
</taskSubmitter>
</div>
<div
<div
v-show="showExtraSettings"
v-if="'reset_lens_shading' in actions"
class="uk-child-width-expand"
> <taskSubmitter
>
<taskSubmitter
:can-terminate="false"
:requires-confirmation="false"
:submit-url="cameraUri + 'reset_lens_shading'"
@ -132,13 +124,16 @@ export default {
methods: {
updateActions: async function() {
try{
let response = await axios.get(this.cameraUri) // Get the thing description
let td = response.data
this.actions = td.actions
console.log("full auto calibrate in actions", 'full_auto_calibrate' in this.actions)
} catch(error) {
this.modalError(error) // Let mixin handle error
try {
let response = await axios.get(this.cameraUri); // Get the thing description
let td = response.data;
this.actions = td.actions;
console.log(
"full auto calibrate in actions",
"full_auto_calibrate" in this.actions
);
} catch (error) {
this.modalError(error); // Let mixin handle error
}
},