diff --git a/src/components/appContent.vue b/src/components/appContent.vue index c283d22d..78dded2a 100644 --- a/src/components/appContent.vue +++ b/src/components/appContent.vue @@ -4,6 +4,11 @@ class="uk-margin-remove uk-padding-remove uk-height-1-1" uk-grid > + +
{ // Update plugins - this.updatePlugins(); + this.updatePlugins().then(() => { + // Start initialisation modals + this.startModals(); + }); + if (ready) { console.log("Left panel now ready"); } else { @@ -244,7 +257,7 @@ export default { methods: { updatePlugins: function() { console.log("Updating plugin forms"); - axios + return axios .get(this.pluginsUri) .then(response => { console.log(response); @@ -258,6 +271,9 @@ export default { if (!(this.currentTab == tab)) { this.currentTab = tab; } + }, + startModals: function() { + this.$refs["calibrationModal"].show(); } } }; diff --git a/src/components/modalComponents/calibrationModal.vue b/src/components/modalComponents/calibrationModal.vue new file mode 100644 index 00000000..7b53c4ee --- /dev/null +++ b/src/components/modalComponents/calibrationModal.vue @@ -0,0 +1,270 @@ + + + + + diff --git a/src/components/viewComponents/miniStreamDisplay.vue b/src/components/viewComponents/miniStreamDisplay.vue new file mode 100644 index 00000000..4becd596 --- /dev/null +++ b/src/components/viewComponents/miniStreamDisplay.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/components/viewComponents/settingsComponents/cameraCalibrationSettings.vue b/src/components/viewComponents/settingsComponents/cameraCalibrationSettings.vue new file mode 100644 index 00000000..bdaa45cc --- /dev/null +++ b/src/components/viewComponents/settingsComponents/cameraCalibrationSettings.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/components/viewComponents/settingsComponents/cameraSettings.vue b/src/components/viewComponents/settingsComponents/cameraSettings.vue index 234512f4..a7616481 100644 --- a/src/components/viewComponents/settingsComponents/cameraSettings.vue +++ b/src/components/viewComponents/settingsComponents/cameraSettings.vue @@ -57,76 +57,37 @@
-
-

Automatic calibration

- - -
- -
-
- -
- -
- -
-
+

Automatic calibration

+ - + diff --git a/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue b/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue index c67b4b89..26dbf50e 100644 --- a/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue +++ b/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue @@ -1,10 +1,5 @@