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

WIP: update webapp to use new backend

Browse source 
This is still very much WIP, but I now have fast
autofocus, stage moves, image streaming, and click-to-move.
This commit is contained in:
Richard Bowman 2023-09-04 22:00:56 +01:00
parent e82acf2941
commit 799dc7f522
12 changed files with 9371 additions and 8401 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/components/genericComponents/miniStreamDisplay.vue
View file

@ -28,7 +28,7 @@ export default {
computed: {
streamImgUri: function() {
return `${this.$store.getters.baseUri}/api/v2/streams/mjpeg`;
return `${this.$store.getters.baseUri}/camera/mjpeg_stream`;
}
},
methods: {

7
webapp/src/components/genericComponents/taskSubmitter.vue
View file

@ -142,7 +142,7 @@ export default {
if (task.status == "pending" || task.status == "running") {
this.taskStarted = true;
this.$emit("taskStarted", this.taskId);
this.startPolling(task.id, task.links.self.href);
this.startPolling(task.id, task.links.find(t => t.rel==self).href);
}
}
});
@ -219,7 +219,10 @@ export default {
var checkCondition = (resolve, reject) => {
// If the condition is met, we're done!
axios.get(this.taskUrl).then(response => {
axios.get(
this.taskUrl,
{baseURL: this.$store.getters.baseUri}
).then(response => {
var result = response.data.status;
// If the task ends with success
if (result == "completed") {