Changed navigate to control and updated file names to match.
This commit is contained in:
parent
c023449b75
commit
1d923798e6
4 changed files with 11 additions and 11 deletions
|
|
@ -102,7 +102,7 @@ import tabIcon from "./genericComponents/tabIcon";
|
||||||
import tabContent from "./genericComponents/tabContent";
|
import tabContent from "./genericComponents/tabContent";
|
||||||
|
|
||||||
// Import new content components
|
// Import new content components
|
||||||
import navigateContent from "./tabContentComponents/navigateContent.vue";
|
import controlContent from "./tabContentComponents/controlContent.vue";
|
||||||
import slideScanContent from "./tabContentComponents/slideScanContent.vue";
|
import slideScanContent from "./tabContentComponents/slideScanContent.vue";
|
||||||
import backgroundDetectContent from "./tabContentComponents/backgroundDetectContent.vue";
|
import backgroundDetectContent from "./tabContentComponents/backgroundDetectContent.vue";
|
||||||
import viewContent from "./tabContentComponents/viewContent.vue";
|
import viewContent from "./tabContentComponents/viewContent.vue";
|
||||||
|
|
@ -123,7 +123,7 @@ export default {
|
||||||
components: {
|
components: {
|
||||||
tabIcon,
|
tabIcon,
|
||||||
tabContent,
|
tabContent,
|
||||||
navigateContent,
|
controlContent,
|
||||||
slideScanContent,
|
slideScanContent,
|
||||||
viewContent,
|
viewContent,
|
||||||
settingsContent,
|
settingsContent,
|
||||||
|
|
@ -182,9 +182,9 @@ export default {
|
||||||
component: viewContent
|
component: viewContent
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "navigate",
|
id: "control",
|
||||||
icon: "gamepad",
|
icon: "gamepad",
|
||||||
component: navigateContent
|
component: controlContent
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "background detect",
|
id: "background detect",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div id="paneNavigate" class="uk-padding-small">
|
<div id="paneControl" class="uk-padding-small">
|
||||||
<div v-if="setPosition">
|
<div v-if="setPosition">
|
||||||
<ul uk-accordion="multiple: true">
|
<ul uk-accordion="multiple: true">
|
||||||
<li>
|
<li>
|
||||||
|
|
@ -180,7 +180,7 @@ import ActionButton from "../../labThingsComponents/actionButton.vue";
|
||||||
|
|
||||||
// Export main app
|
// Export main app
|
||||||
export default {
|
export default {
|
||||||
name: "PaneNavigate",
|
name: "PaneControl",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionButton
|
ActionButton
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<!-- Grid managing tab content -->
|
<!-- Grid managing tab content -->
|
||||||
<div uk-grid class="uk-height-1-1 uk-margin-remove uk-padding-remove">
|
<div uk-grid class="uk-height-1-1 uk-margin-remove uk-padding-remove">
|
||||||
<div class="control-component">
|
<div class="control-component">
|
||||||
<paneNavigate />
|
<paneControl />
|
||||||
</div>
|
</div>
|
||||||
<div class="view-component uk-width-expand">
|
<div class="view-component uk-width-expand">
|
||||||
<streamDisplay />
|
<streamDisplay />
|
||||||
|
|
@ -11,14 +11,14 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import paneNavigate from "./navigateComponents/paneNavigate";
|
import paneControl from "./controlComponents/paneControl";
|
||||||
import streamDisplay from "./streamContent.vue";
|
import streamDisplay from "./streamContent.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "NavigateContent",
|
name: "ControlContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
paneNavigate,
|
paneControl,
|
||||||
streamDisplay
|
streamDisplay
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -125,7 +125,7 @@ export default {
|
||||||
let xRelative = (0.5 * event.target.offsetWidth - xCoordinate) * scale;
|
let xRelative = (0.5 * event.target.offsetWidth - xCoordinate) * scale;
|
||||||
let yRelative = (0.5 * event.target.offsetHeight - yCoordinate) * scale;
|
let yRelative = (0.5 * event.target.offsetHeight - yCoordinate) * scale;
|
||||||
|
|
||||||
// Emit a signal to move, acted on by panelNavigate.vue
|
// Emit a signal to move, acted on by paneControl.vue
|
||||||
this.$root.$emit(
|
this.$root.$emit(
|
||||||
"globalMoveInImageCoordinatesEvent",
|
"globalMoveInImageCoordinatesEvent",
|
||||||
-xRelative,
|
-xRelative,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue