diff --git a/New client/chameleon-client/src/components/cv-range-slider.vue b/New client/chameleon-client/src/components/cv-range-slider.vue index 34dbe232a..e5f088847 100644 --- a/New client/chameleon-client/src/components/cv-range-slider.vue +++ b/New client/chameleon-client/src/components/cv-range-slider.vue @@ -5,13 +5,13 @@ {{name}} - + @@ -25,6 +25,25 @@ props:['name','min','max','value','step'], data() { return { + prependFocused:false, + appendFocused:false + + } + }, + methods:{ + handleChange(val){ + let i = 0; + if(this.prependFocused === false && this.appendFocused === true){ + i = 1; + } + if(this.prependFocused || this.appendFocused){ + this.$set(this.localValue,i,val); + } + }, + handleInput(val){ + if(!this.prependFocused || !this.appendFocused){ + this.localValue = val; + } } }, computed:{ diff --git a/New client/chameleon-client/src/components/cv-slider.vue b/New client/chameleon-client/src/components/cv-slider.vue index af5779ec0..31af2d6a1 100644 --- a/New client/chameleon-client/src/components/cv-slider.vue +++ b/New client/chameleon-client/src/components/cv-slider.vue @@ -5,9 +5,9 @@ {{name}} - + @@ -21,10 +21,20 @@ props:['min','max','name','value','step'], data() { return { - + isFocused:false } }, methods:{ + handleChange(val){ + if(this.isFocused){ + this.localValue = parseFloat(val); + } + }, + handleInput(val){ + if(!this.isFocused){ + this.localValue = val; + } + } }, computed:{ localValue:{ diff --git a/New client/chameleon-client/src/views/Camera.vue b/New client/chameleon-client/src/views/Camera.vue index bbfea85eb..8a1f9e2a1 100644 --- a/New client/chameleon-client/src/views/Camera.vue +++ b/New client/chameleon-client/src/views/Camera.vue @@ -91,6 +91,9 @@ import CVicon from '../components/cv-icon' CVicon }, methods:{ + test(value){ + console.log(value) + } }, data() { return { diff --git a/New client/chameleon-client/src/views/CameraViewes/InputTab.vue b/New client/chameleon-client/src/views/CameraViewes/InputTab.vue index a4abd67cb..e2b7b356a 100644 --- a/New client/chameleon-client/src/views/CameraViewes/InputTab.vue +++ b/New client/chameleon-client/src/views/CameraViewes/InputTab.vue @@ -23,10 +23,7 @@ import CVselect from '../../components/cv-select' } }, methods:{ - // handleInput(key,val){ - // let msg = this.$msgPack().encode({key,val}); - // this.$socket.send(msg); - // } + }, computed:{} } diff --git a/New client/chameleon-client/src/views/CameraViewes/ThresholdTab.vue b/New client/chameleon-client/src/views/CameraViewes/ThresholdTab.vue index 0e0716317..745481bf8 100644 --- a/New client/chameleon-client/src/views/CameraViewes/ThresholdTab.vue +++ b/New client/chameleon-client/src/views/CameraViewes/ThresholdTab.vue @@ -23,6 +23,8 @@ import CVswitch from '../../components/cv-switch' } }, computed:{ + }, + methods:{ } }