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

Leave scan log open until closed

Browse source 
The log/progress view is now closed explicitly, rather than disappearing as soon as the scan is over.
This commit is contained in:
Richard Bowman 2024-01-10 20:33:49 +00:00
parent f03e0188e4
commit 215bfb5121
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/components/tabContentComponents/slideScanContent.vue
View file

@ -41,7 +41,7 @@
submit-label="Start smart scan" submit-label="Start smart scan"
:can-terminate="true" :can-terminate="true"
:submit-data="{ sample_check: true }" :submit-data="{ sample_check: true }"
@update:taskRunning="scanning = $event" @taskStarted="scanning = true"
@update:taskStatus="taskStatus = $event" @update:taskStatus="taskStatus = $event"
@update:progress="progress = $event" @update:progress="progress = $event"
@update:log="log = $event" @update:log="log = $event"
@ -53,7 +53,6 @@
submit-label="Start manual scan" submit-label="Start manual scan"
:can-terminate="true" :can-terminate="true"
:submit-data="{ sample_check: false }" :submit-data="{ sample_check: false }"
@update:taskRunning="scanning = $event"
@update:taskStatus="taskStatus = $event" @update:taskStatus="taskStatus = $event"
@update:progress="progress = $event" @update:progress="progress = $event"
@update:log="log = $event" @update:log="log = $event"
@ -68,13 +67,21 @@
/> />
<action-progress-bar :progress="progress" :task-status="taskStatus" /> <action-progress-bar :progress="progress" :task-status="taskStatus" />
<button <button
v-if="scanning" v-if="cancellable"
type="button" type="button"
class="uk-button uk-button-danger uk-margin-remove uk-float-right uk-width-1-1" class="uk-button uk-button-danger uk-margin-remove uk-float-right uk-width-1-1"
@click="$refs.smartScanTaskSubmitter.terminateTask()" @click="$refs.smartScanTaskSubmitter.terminateTask()"
> >
Cancel Cancel
</button> </button>
<button
v-if="!cancellable"
type="button"
class="uk-button uk-button-danger uk-margin-remove uk-float-right uk-width-1-1"
@click="scanning = false"
>
Close
</button>
</div> </div>
</div> </div>
<div class="view-component uk-width-expand"> <div class="view-component uk-width-expand">
@ -117,6 +124,9 @@ export default {
}, },
smartScanUri() { smartScanUri() {
return this.thingActionUrl("smart_scan", "sample_scan"); return this.thingActionUrl("smart_scan", "sample_scan");
},
cancellable() {
return (this.taskStatus == "running") | (this.taskStatus == "pending");
} }
}, },