diff --git a/src/components/controlComponents/paneSettings.vue b/src/components/controlComponents/paneSettings.vue index ca8fd408..24e1a1a0 100644 --- a/src/components/controlComponents/paneSettings.vue +++ b/src/components/controlComponents/paneSettings.vue @@ -13,6 +13,11 @@
+
  • + Camera/stage mapping settings +
    +
  • +
  • Microscope settings
    @@ -25,6 +30,7 @@ import streamSettings from "./settingsComponents/streamSettings.vue"; import microscopeSettings from "./settingsComponents/microscopeSettings.vue"; import cameraSettings from "./settingsComponents/cameraSettings.vue"; +import cameraStageMappingSettings from "./settingsComponents/cameraStageMappingSettings.vue"; import appSettings from "./settingsComponents/appSettings.vue"; // Export main app @@ -34,6 +40,7 @@ export default { components: { streamSettings, cameraSettings, + cameraStageMappingSettings, microscopeSettings, appSettings } diff --git a/src/components/controlComponents/settingsComponents/cameraSettings.vue b/src/components/controlComponents/settingsComponents/cameraSettings.vue index caf62c7a..80bd4a45 100644 --- a/src/components/controlComponents/settingsComponents/cameraSettings.vue +++ b/src/components/controlComponents/settingsComponents/cameraSettings.vue @@ -103,7 +103,7 @@ export default { data: function() { return { settings: null, - recalibrationLinks: null, + recalibrationLinks: {}, isCalibrating: false }; }, diff --git a/src/components/controlComponents/settingsComponents/cameraStageMappingSettings.vue b/src/components/controlComponents/settingsComponents/cameraStageMappingSettings.vue new file mode 100644 index 00000000..84ee70eb --- /dev/null +++ b/src/components/controlComponents/settingsComponents/cameraStageMappingSettings.vue @@ -0,0 +1,111 @@ + + + + +