From 1e02f114e1bb09b1822663bbf95f0ad833c95061 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 29 Oct 2019 23:58:06 +0200 Subject: [PATCH] added auto save and save button --- chameleon-client/src/App.vue | 167 +++++----- .../components/OutputTab/DualCalibration.vue | 1 + .../OutputTab/SingleCalibration.vue | 12 +- chameleon-client/src/components/cv-icon.vue | 24 +- chameleon-client/src/components/cv-input.vue | 27 +- .../src/components/cv-number-input.vue | 19 +- chameleon-client/src/components/cv-radio.vue | 20 +- .../src/components/cv-range-slider.vue | 51 +-- chameleon-client/src/components/cv-select.vue | 27 +- chameleon-client/src/components/cv-slider.vue | 48 +-- chameleon-client/src/components/cv-switch.vue | 20 +- chameleon-client/src/main.js | 20 +- chameleon-client/src/plugins/vuetify.js | 8 +- chameleon-client/src/views/Camera.vue | 296 ++++++++++-------- .../src/views/CameraViewes/ContoursTab.vue | 48 +-- .../src/views/CameraViewes/InputTab.vue | 35 ++- .../src/views/CameraViewes/OutputTab.vue | 36 ++- .../src/views/CameraViewes/ThresholdTab.vue | 15 +- chameleon-client/src/views/Settings.vue | 33 +- .../src/views/SettingsViewes/Cameras.vue | 64 ++-- .../src/views/SettingsViewes/General.vue | 48 +-- 21 files changed, 545 insertions(+), 474 deletions(-) diff --git a/chameleon-client/src/App.vue b/chameleon-client/src/App.vue index 2fb184715..4bb7f2913 100644 --- a/chameleon-client/src/App.vue +++ b/chameleon-client/src/App.vue @@ -1,95 +1,94 @@ \ No newline at end of file diff --git a/chameleon-client/src/components/OutputTab/DualCalibration.vue b/chameleon-client/src/components/OutputTab/DualCalibration.vue index 6fcbd8dcd..8e0a65cc3 100644 --- a/chameleon-client/src/components/OutputTab/DualCalibration.vue +++ b/chameleon-client/src/components/OutputTab/DualCalibration.vue @@ -49,6 +49,7 @@ sendSlope(m, b, valid) { this.handleInput('m', m); this.handleInput('b', b); + this.$emit('update'); }, clearSlope() { this.sendSlope(1, 0, false); diff --git a/chameleon-client/src/components/OutputTab/SingleCalibration.vue b/chameleon-client/src/components/OutputTab/SingleCalibration.vue index 77ab8eafe..c77dc8b53 100644 --- a/chameleon-client/src/components/OutputTab/SingleCalibration.vue +++ b/chameleon-client/src/components/OutputTab/SingleCalibration.vue @@ -15,12 +15,14 @@ export default { name: "SingleCalibration", props: ['rawPoint'], - methods:{ - clearPoint(){ - this.handleInput('point',[0,0]); + methods: { + clearPoint() { + this.handleInput('point', [0, 0]); + this.$emit('update'); }, - takePoint(){ - this.handleInput('point',this.rawPoint); + takePoint() { + this.handleInput('point', this.rawPoint); + this.$emit('update'); } } } diff --git a/chameleon-client/src/components/cv-icon.vue b/chameleon-client/src/components/cv-icon.vue index a98b8a0f4..49bf772d8 100644 --- a/chameleon-client/src/components/cv-icon.vue +++ b/chameleon-client/src/components/cv-icon.vue @@ -2,7 +2,7 @@
{{tooltip}} @@ -12,20 +12,18 @@ \ No newline at end of file diff --git a/chameleon-client/src/components/cv-input.vue b/chameleon-client/src/components/cv-input.vue index 342bf2094..76d7f864c 100644 --- a/chameleon-client/src/components/cv-input.vue +++ b/chameleon-client/src/components/cv-input.vue @@ -5,7 +5,8 @@ {{name}} - +
@@ -14,26 +15,24 @@ \ No newline at end of file diff --git a/chameleon-client/src/components/cv-number-input.vue b/chameleon-client/src/components/cv-number-input.vue index 375861c1d..e97d6ac88 100644 --- a/chameleon-client/src/components/cv-number-input.vue +++ b/chameleon-client/src/components/cv-number-input.vue @@ -5,7 +5,8 @@ {{name}} - + @@ -14,18 +15,16 @@ \ No newline at end of file diff --git a/chameleon-client/src/components/cv-radio.vue b/chameleon-client/src/components/cv-radio.vue index 91dfb88ab..a6ec40a01 100644 --- a/chameleon-client/src/components/cv-radio.vue +++ b/chameleon-client/src/components/cv-radio.vue @@ -1,7 +1,7 @@ @@ -9,19 +9,17 @@ \ No newline at end of file diff --git a/chameleon-client/src/components/cv-range-slider.vue b/chameleon-client/src/components/cv-range-slider.vue index 7a2d5e6fd..571fa086f 100644 --- a/chameleon-client/src/components/cv-range-slider.vue +++ b/chameleon-client/src/components/cv-range-slider.vue @@ -5,13 +5,18 @@ {{name}} - - \ No newline at end of file diff --git a/chameleon-client/src/views/CameraViewes/InputTab.vue b/chameleon-client/src/views/CameraViewes/InputTab.vue index ba6b06168..6d602b5a4 100644 --- a/chameleon-client/src/views/CameraViewes/InputTab.vue +++ b/chameleon-client/src/views/CameraViewes/InputTab.vue @@ -1,34 +1,39 @@ \ No newline at end of file diff --git a/chameleon-client/src/views/CameraViewes/OutputTab.vue b/chameleon-client/src/views/CameraViewes/OutputTab.vue index b740bac70..a81dce2cb 100644 --- a/chameleon-client/src/views/CameraViewes/OutputTab.vue +++ b/chameleon-client/src/views/CameraViewes/OutputTab.vue @@ -2,12 +2,12 @@
+ @input="handleData('sortMode')"/> Calibrate: - + @input="handleData('calibrationMode')"/> + Points are too close Close @@ -16,19 +16,27 @@ diff --git a/chameleon-client/src/views/Settings.vue b/chameleon-client/src/views/Settings.vue index 955341178..763e67c22 100644 --- a/chameleon-client/src/views/Settings.vue +++ b/chameleon-client/src/views/Settings.vue @@ -2,12 +2,13 @@
- + General Cameras
- +
@@ -15,28 +16,28 @@
- +
\ No newline at end of file diff --git a/chameleon-client/src/views/SettingsViewes/Cameras.vue b/chameleon-client/src/views/SettingsViewes/Cameras.vue index 9ee8ec314..926c69e50 100644 --- a/chameleon-client/src/views/SettingsViewes/Cameras.vue +++ b/chameleon-client/src/views/SettingsViewes/Cameras.vue @@ -1,69 +1,69 @@ \ No newline at end of file diff --git a/chameleon-client/src/views/SettingsViewes/General.vue b/chameleon-client/src/views/SettingsViewes/General.vue index 733cd7078..87b28c56e 100644 --- a/chameleon-client/src/views/SettingsViewes/General.vue +++ b/chameleon-client/src/views/SettingsViewes/General.vue @@ -1,46 +1,46 @@ \ No newline at end of file