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

Properly handle new connection clicks

Browse source
This commit is contained in:
Joel Collins 2019-09-19 15:28:15 +01:00
parent cceaa645be
commit f8bb26b130
5 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/panelLeft.vue
View file

@ -4,7 +4,7 @@
<!-- Vertical tab bar -->
<div id="switcher-left" class="uk-flex uk-flex-column uk-padding-remove uk-width-auto uk-height-1-1">
<tabIcon id="status" :requireConnection="false" :currentTab="currentTab" @set-tab="setTab">
<i class="material-icons">settings_ethernet</i>
<i class="material-icons">thumbs_up_down</i>
</tabIcon>
<tabIcon id="navigate" :requireConnection="true" :currentTab="currentTab" @set-tab="setTab">
<i class="material-icons">gamepad</i>

13
src/components/panelRight.vue
View file

@ -1,7 +1,7 @@
<template>
<!-- Tabbed panel for gallery and live views -->
<div id="panel-right" class="uk-flex uk-flex-column uk-margin-remove uk-padding-remove uk-width-expand uk-height-1-1">
<ul class="uk-flex-none uk-flex-center uk-margin-remove-bottom uk-text-center" uk-tab="swiping: false">
<ul class="uk-flex-none uk-flex-center uk-margin-remove-bottom uk-text-center" id="tabContainer" uk-tab="swiping: false">
<li><a href="#" uk-switcher-item="connect">Connect</a></li>
<li v-bind:class="{'uk-disabled': !this.$store.getters.ready}"><a href="#" uk-switcher-item="preview">Live</a></li>
<li v-bind:class="{'uk-disabled': !this.$store.getters.ready}"><a href="#" uk-switcher-item="gallery">Gallery</a></li>
@ -56,6 +56,17 @@ export default {
}
});
// Create a global event to switch the active tab
var switcherObj = UIkit.tab('#tabContainer')
console.log(switcherObj)
this.$root.$on('globalTogglePanelRightTab', (state) => {
console.log(`Toggling panelRight tab to ${state}`)
switcherObj.show(1)
})
},
methods: {
}
}

12
src/components/viewComponents/connectDisplay.vue
View file

@ -65,7 +65,7 @@
:name="host.name"
:hostname="host.hostname"
:port="host.port"
v-on:connect="connectToHost(host)"
v-on:connect="handleConnectButton(host)"
v-on:delete="delSavedHost(host)"
></hostCard>
</div>
@ -87,7 +87,7 @@
:hostname="host.hostname"
:port="host.port"
:deletable="false"
v-on:connect="connectToHost(host)"
v-on:connect="handleConnectButton(host)"
></hostCard>
</div>
@ -196,7 +196,10 @@ export default {
this.$store.dispatch('firstConnect')
.then (() => {
console.log("Connected!")
// Check client and server match
this.checkServerVersion()
// Switch to live view tab
this.$root.$emit('globalTogglePanelRightTab', 'preview')
})
.catch(error => {
this.modalError(error) // Let mixin handle error
@ -226,6 +229,11 @@ export default {
this.connectToHost(selectedHost)
},
handleConnectButton: function(host) {
this.computedLocalMode = false
this.connectToHost(host)
},
checkServerVersion: function () {
this.$store.dispatch('updateState')
.then (() => {

11
src/components/viewComponents/galleryComponents/captureCard.vue
View file

@ -29,9 +29,10 @@
</div>
<div class="uk-card-footer uk-padding-small">
<span v-if="temporary" class="uk-label uk-label-danger uk-margin-small-right" uk-tooltip="title: Capture will be removed automatically; delay: 500">Temporary</span>
<span v-for="tag in tags" :key="tag" v-on:click="delTagConfirm(tag)" class="uk-label uk-margin-small-right deletable-label"> {{ tag }} </span>
<div v-for="tag in tags" :key="tag">
<span v-if="tag==='temporary'" class="uk-label uk-label-danger uk-margin-small-right" uk-tooltip="title: Capture will be removed automatically; delay: 500">Temporary</span>
<span v-else v-on:click="delTagConfirm(tag)" class="uk-label uk-margin-small-right deletable-label"> {{ tag }} </span>
</div>
<a v-bind:href="tagModalTarget" uk-toggle>
<span class="uk-label uk-label-success uk-margin-small-right">Add</span>
@ -84,10 +85,6 @@ export default {
name: 'captureCard',
props: {
temporary: {
type: Boolean,
required: true
},
metadata: {
type: Object,
required: true