Button added to launch calibration menu manually
This commit is contained in:
parent
f39f8f02bd
commit
e1aca0bef7
2 changed files with 24 additions and 1 deletions
|
|
@ -223,6 +223,14 @@ export default {
|
||||||
this.onHide();
|
this.onHide();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// Forces modal to show on button press
|
||||||
|
force_show: function() {
|
||||||
|
this.ready = true;
|
||||||
|
this.stepValue = 0;
|
||||||
|
// Show the modal
|
||||||
|
var el = this.$refs["calibrationModalEl"];
|
||||||
|
this.showModalElement(el); // Calls the mixin
|
||||||
|
},
|
||||||
|
|
||||||
hide: function() {
|
hide: function() {
|
||||||
// Show the modal
|
// Show the modal
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,10 @@
|
||||||
<template>
|
<template>
|
||||||
<!-- 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">
|
||||||
|
<calibrationModal
|
||||||
|
ref="calibrationModal"
|
||||||
|
@onClose="enterApp()"
|
||||||
|
></calibrationModal>
|
||||||
<div class="settings-nav">
|
<div class="settings-nav">
|
||||||
<ul class="uk-nav uk-nav-default">
|
<ul class="uk-nav uk-nav-default">
|
||||||
<li class="uk-nav-header">Application Settings</li>
|
<li class="uk-nav-header">Application Settings</li>
|
||||||
|
|
@ -18,6 +22,12 @@
|
||||||
</tabIcon>
|
</tabIcon>
|
||||||
</li>
|
</li>
|
||||||
<li class="uk-nav-header">Microscope Settings</li>
|
<li class="uk-nav-header">Microscope Settings</li>
|
||||||
|
<button
|
||||||
|
submit-label="Launch Calibration Wizard"
|
||||||
|
type="button"
|
||||||
|
class="uk-button uk-button-default uk-width-1-1"
|
||||||
|
@click="startModals"
|
||||||
|
>Launch Calibration Wizard</button>
|
||||||
<li>
|
<li>
|
||||||
<tabIcon
|
<tabIcon
|
||||||
id="settings-camera-icon"
|
id="settings-camera-icon"
|
||||||
|
|
@ -106,6 +116,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import streamSettings from "./settingsComponents/streamSettings.vue";
|
import streamSettings from "./settingsComponents/streamSettings.vue";
|
||||||
|
import calibrationModal from "../modalComponents/calibrationModal.vue";
|
||||||
import cameraSettings from "./settingsComponents/cameraSettings.vue";
|
import cameraSettings from "./settingsComponents/cameraSettings.vue";
|
||||||
import appSettings from "./settingsComponents/appSettings.vue";
|
import appSettings from "./settingsComponents/appSettings.vue";
|
||||||
import CSMSettings from "./settingsComponents/CSMSettings.vue";
|
import CSMSettings from "./settingsComponents/CSMSettings.vue";
|
||||||
|
|
@ -125,7 +136,8 @@ export default {
|
||||||
CSMSettings,
|
CSMSettings,
|
||||||
appSettings,
|
appSettings,
|
||||||
tabIcon,
|
tabIcon,
|
||||||
tabContent
|
tabContent,
|
||||||
|
calibrationModal
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function() {
|
data: function() {
|
||||||
|
|
@ -140,6 +152,9 @@ export default {
|
||||||
if (!(this.currentTab == tab)) {
|
if (!(this.currentTab == tab)) {
|
||||||
this.currentTab = tab;
|
this.currentTab = tab;
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
startModals: function() {
|
||||||
|
this.$refs.calibrationModal.force_show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue