diff --git a/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipelineSettings.java b/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipelineSettings.java index e3095924e..a4021691d 100644 --- a/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipelineSettings.java +++ b/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipelineSettings.java @@ -13,6 +13,6 @@ public class CVPipelineSettings { public double exposure = 50.0; public double brightness = 50.0; public double gain = 0; - public int VideoModeIndex = 0; + public int videoModeIndex = 0; public StreamDivisor streamDivisor = StreamDivisor.NONE; } diff --git a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java index d147cac94..1848e4803 100644 --- a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java @@ -153,7 +153,7 @@ public class SocketHandler { currentCamera.setBrightness((Integer) entry.getValue()); break; } - case "videoMode":{ + case "videoModeIndex":{ currentCamera.setVideoMode((Integer) entry.getValue()); break; } diff --git a/chameleon-client/src/store.js b/chameleon-client/src/store.js index bdbd6fc44..8ab59aa33 100644 --- a/chameleon-client/src/store.js +++ b/chameleon-client/src/store.js @@ -36,7 +36,7 @@ export default new Vuex.Store({ multiple:false, isBinary: 0, calibrationMode: 0, - VideoModeIndex:0, + videoModeIndex:0, streamDivisor:0 }, cameraSettings: {}, diff --git a/chameleon-client/src/views/CameraViewes/InputTab.vue b/chameleon-client/src/views/CameraViewes/InputTab.vue index 51c7a94a7..e45835e0a 100644 --- a/chameleon-client/src/views/CameraViewes/InputTab.vue +++ b/chameleon-client/src/views/CameraViewes/InputTab.vue @@ -4,7 +4,7 @@ - + @@ -45,7 +45,7 @@ }, streamResolutionList: { get() { - let cam_res = this.$store.state.resolutionList[this.value.VideoModeIndex]; + let cam_res = this.$store.state.resolutionList[this.value.videoModeIndex]; let tmp_list = []; let x = 1; for (let i = 0; i < 4; i++) {