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

Fixed global state and scrolltotop

Browse source
This commit is contained in:
Joel Collins 2020-11-22 17:01:46 +00:00
parent a1ae94792e
commit ef9f257e23
13 changed files with 34 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openflexure_microscope/api/static/src/App.vue
View file

@ -102,9 +102,9 @@ export default {
},
handleTheme: function() {
var isDark = false;
if (this.$store.state.globalSettings.appTheme == "dark") {
if (this.$store.state.appTheme == "dark") {
isDark = true;
} else if (this.$store.state.globalSettings.appTheme == "system") {
} else if (this.$store.state.appTheme == "system") {
if (this.systemDark) {
isDark = true;
}

2
openflexure_microscope/api/static/src/components/appContent.vue
View file

@ -214,7 +214,7 @@ export default {
computed: {
enabledTopTabs: function() {
var enabledTabs = this.topTabs;
if (this.$store.state.globalSettings.IHIEnabled) {
if (this.$store.state.IHIEnabled) {
enabledTabs.push({
id: "slidescan",
icon: "settings_overscan",

6
openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/devTools.vue
View file

@ -23,6 +23,12 @@ export default {
};
},
mounted() {
if (!this.$store.getters.ready) {
this.currentOrigin = "http://microscope.local:5000";
}
},
methods: {
overrideAPIHost: function() {
this.$store.commit("changeOrigin", this.currentOrigin);

2
openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue
View file

@ -308,7 +308,7 @@ export default {
resizeDims: [640, 480],
tags: [],
annotations: {
Client: `${process.env.PACKAGE.name}.${process.env.PACKAGE.version}`
Client: "openflexure-microscope-jsclient:builtin"
},
scanUri: null
};

8
openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/captureCard.vue
View file

@ -1,7 +1,7 @@
<template>
<div
class="capture-card uk-card uk-card-default uk-padding-remove uk-width-medium"
:class="{ 'uk-card-secondary': $store.state.globalSettings.darkMode }"
:class="{ 'uk-card-secondary': $store.state.darkMode }"
>
<div class="uk-card-media-top">
<a class="lightbox-link" :href="imgURL" :data-caption="name">
@ -70,8 +70,7 @@
<div
class="uk-modal-dialog uk-modal-body"
:class="{
'uk-light uk-background-secondary':
$store.state.globalSettings.darkMode
'uk-light uk-background-secondary': $store.state.darkMode
}"
>
<button class="uk-modal-close-default" type="button" uk-close></button>
@ -112,8 +111,7 @@
<form
class="uk-modal-dialog uk-modal-body uk-margin-auto-vertical"
:class="{
'uk-light uk-background-secondary':
$store.state.globalSettings.darkMode
'uk-light uk-background-secondary': $store.state.darkMode
}"
@submit.prevent="handleTagSubmit"
>

8
openflexure_microscope/api/static/src/components/tabContentComponents/galleryContent.vue
View file

@ -24,8 +24,7 @@
<a href="#">Filter</a>
<div
:class="{
'uk-light uk-background-secondary':
$store.state.globalSettings.darkMode
'uk-light uk-background-secondary': $store.state.darkMode
}"
class="uk-navbar-dropdown"
>
@ -342,7 +341,10 @@ export default {
methods: {
scrollToTop() {
document.querySelector("#container-left").scrollTop = 0;
const el = document.querySelector("#container-left");
if (el) {
el.scrollTop = 0;
}
},
updateCaptures: function() {

5
openflexure_microscope/api/static/src/components/tabContentComponents/loggingContent.vue
View file

@ -111,7 +111,10 @@ export default {
methods: {
scrollToTop() {
document.querySelector("#container-left").scrollTop = 0;
const el = document.querySelector("#container-left");
if (el) {
el.scrollTop = 0;
}
},
visibilityChanged(isVisible) {
if (isVisible) {

2
openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/appSettings.vue
View file

@ -26,7 +26,7 @@ export default {
computed: {
appTheme: {
get() {
return this.$store.state.globalSettings.appTheme;
return this.$store.state.appTheme;
},
set(value) {
this.$store.commit("changeAppTheme", value);

2
openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue
View file

@ -29,7 +29,7 @@ export default {
computed: {
IHIEnabled: {
get() {
return this.$store.state.globalSettings.IHIEnabled;
return this.$store.state.IHIEnabled;
},
set(value) {
this.$store.commit("changeIHIEnabled", value);

6
openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/streamSettings.vue
View file

@ -61,7 +61,7 @@ export default {
computed: {
disableStream: {
get() {
return this.$store.state.globalSettings.disableStream;
return this.$store.state.disableStream;
},
set(value) {
this.$store.commit("changeDisableStream", value);
@ -70,7 +70,7 @@ export default {
autoGpuPreview: {
get() {
return this.$store.state.globalSettings.autoGpuPreview;
return this.$store.state.autoGpuPreview;
},
set(value) {
this.$store.commit("changeAutoGpuPreview", value);
@ -80,7 +80,7 @@ export default {
trackWindow: {
get() {
return this.$store.state.globalSettings.trackWindow;
return this.$store.state.trackWindow;
},
set(value) {
this.$store.commit("changeTrackWindow", value);

18
openflexure_microscope/api/static/src/components/tabContentComponents/streamContent.vue
View file

@ -21,7 +21,7 @@
</div>
<div
v-else-if="$store.state.globalSettings.disableStream"
v-else-if="$store.state.disableStream"
class="uk-position-center position-relative text-center"
>
Stream preview disabled
@ -52,10 +52,7 @@ export default {
computed: {
streamEnabled: function() {
return (
this.$store.getters.ready &&
!this.$store.state.globalSettings.disableStream
);
return this.$store.getters.ready && !this.$store.state.disableStream;
},
thisStreamOpen: function() {
// Only a single MJPEG connection should be open at a time
@ -102,7 +99,7 @@ export default {
created: function() {
console.log(`${this._uid} created`);
// Send a request to start/stop GPU preview based on global setting
this.safePreviewRequest(this.$store.state.globalSettings.autoGpuPreview);
this.safePreviewRequest(this.$store.state.autoGpuPreview);
},
beforeDestroy: function() {
@ -187,7 +184,7 @@ export default {
} else {
console.log(`STREAM ${this._uid} OPEN`);
this.$store.commit("addStream", this._uid);
if (this.$store.state.globalSettings.autoGpuPreview == true) {
if (this.$store.state.autoGpuPreview == true) {
// Start the preview immediately
this.safePreviewRequest(true);
// Send another start preview request after a timeout
@ -258,7 +255,7 @@ export default {
// If requesting starting the stream, but this component is inactive, skip
if (
this.$store.getters.ready == true &&
this.$store.state.globalSettings.autoGpuPreview == true
this.$store.state.autoGpuPreview == true
) {
var requestUri = null;
// Create URI
@ -270,10 +267,7 @@ export default {
// Generate payload if tracking window position
var payload = {};
if (
this.$store.state.globalSettings.trackWindow == true &&
state == true
) {
if (this.$store.state.trackWindow == true && state == true) {
// Recalculate frame dimensions and position
this.recalculateSize();
// Copy data into payload array

6
openflexure_microscope/api/static/src/main.js
View file

@ -3,7 +3,6 @@ import App from "./App.vue";
import store from "./store";
import UIkit from "uikit";
import VueTour from "vue-tour";
import LoadScript from "vue-plugin-load-script";
import VueFriendlyIframe from "vue-friendly-iframe";
import VueObserveVisibility from "vue-observe-visibility";
@ -22,9 +21,6 @@ UIkit.mixin(
"accordion"
);
// Use load-script module
Vue.use(LoadScript);
// Use vue-tour module
Vue.use(VueTour);
@ -58,7 +54,7 @@ Vue.mixin({
.finally(function() {
// Reenable the GPU preview, if it was active before the modal
console.log("Re-enabling GPU preview");
if (context.$store.state.globalSettings.autoGpuPreview) {
if (context.$store.state.autoGpuPreview) {
console.log("Re-enabling preview");
context.$root.$emit("globalTogglePreview", true);
}

15
openflexure_microscope/api/static/vue.config.js
View file

@ -1,15 +0,0 @@
var webpack = require("webpack");
module.exports = {
configureWebpack: {
plugins: [
new webpack.DefinePlugin({
"process.env": {
PACKAGE: JSON.stringify(require("./package.json"))
}
})
]
},
publicPath: ""
};