Merge branch 'remove-gpu-preview-references' into 'v3'
Remove references to old GPU preview feature. Closes #676 See merge request openflexure/openflexure-microscope-server!505
This commit is contained in:
commit
87b5342254
4 changed files with 1 additions and 18 deletions
|
|
@ -239,9 +239,7 @@ export default {
|
|||
this.$store.commit("changeWaiting", false);
|
||||
}
|
||||
},
|
||||
handleExit: function () {
|
||||
eventBus.emit("globalTogglePreview", false);
|
||||
},
|
||||
handleExit: function () {},
|
||||
|
||||
/**
|
||||
* Handle global mouse wheel events to be associated with navigation
|
||||
|
|
|
|||
|
|
@ -98,8 +98,6 @@ export default {
|
|||
},
|
||||
|
||||
beforeUnmount: function () {
|
||||
// Remove global signal listener to change the GPU preview state
|
||||
eventBus.off("globalTogglePreview", true);
|
||||
// Disconnect the size observer
|
||||
this.sizeObserver.disconnect();
|
||||
// Remove from the array of active streams
|
||||
|
|
|
|||
|
|
@ -12,11 +12,6 @@ import { eventBus } from "@/eventBus";
|
|||
export default {
|
||||
methods: {
|
||||
modalConfirm: function (modalText) {
|
||||
var context = this;
|
||||
|
||||
// Stop GPU preview to show modal
|
||||
eventBus.emit("globalTogglePreview", false);
|
||||
|
||||
// force OK to be capitalised
|
||||
UIkit.modal.i18n = { ok: "OK", cancel: "Cancel" };
|
||||
|
||||
|
|
@ -32,10 +27,6 @@ export default {
|
|||
},
|
||||
)
|
||||
.finally(function () {
|
||||
// Re-enable the GPU preview, if it was active before the modal
|
||||
if (context.$store.state.autoGpuPreview) {
|
||||
eventBus.emit("globalTogglePreview", true);
|
||||
}
|
||||
eventBus.emit("modalClosed");
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ export default createStore({
|
|||
available: false,
|
||||
waiting: false,
|
||||
error: "",
|
||||
autoGpuPreview: false,
|
||||
trackWindow: true,
|
||||
activeStreams: {},
|
||||
microscopeHostname: "",
|
||||
|
|
@ -95,9 +94,6 @@ export default createStore({
|
|||
changeDisableStream(state, disabled) {
|
||||
state.disableStream = disabled;
|
||||
},
|
||||
changeAutoGpuPreview(state, enabled) {
|
||||
state.autoGpuPreview = enabled;
|
||||
},
|
||||
changeTrackWindow(state, enabled) {
|
||||
state.trackWindow = enabled;
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue