Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-28 02:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fix in video mode name

Browse Source
This commit is contained in:
ori agranat
2019-11-30 22:03:28 +02:00
parent 29466fa3cd
commit e8083794bd
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipelineSettings.java
View File

@@ -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;
}

2
Main/src/main/java/com/chameleonvision/web/SocketHandler.java
View File

@@ -153,7 +153,7 @@ public class SocketHandler {
currentCamera.setBrightness((Integer) entry.getValue());
break;
}
case "videoMode":{
case "videoModeIndex":{
currentCamera.setVideoMode((Integer) entry.getValue());
break;
}

2
chameleon-client/src/store.js
View File

@@ -36,7 +36,7 @@ export default new Vuex.Store({
multiple:false,
isBinary: 0,
calibrationMode: 0,
VideoModeIndex:0,
videoModeIndex:0,
streamDivisor:0
},
cameraSettings: {},

4
chameleon-client/src/views/CameraViewes/InputTab.vue
View File

@@ -4,7 +4,7 @@
<CVslider name="Brightness" v-model="value.brightness" :min="0" :max="100" @input="handleData('brightness')"/>
<CVselect name="Orientation" v-model="value.rotationMode" :list="['Normal','90° CW','180°','90° CCW']"
@input="handleData('rotationMode')"/>
<CVselect name="Resolution" v-model="value.VideoModeIndex" :list="resolutionList" @input="handleData('VideoModeIndex')"/>
<CVselect name="Resolution" v-model="value.videoModeIndex" :list="resolutionList" @input="handleData('videoModeIndex')"/>
<CVselect name="Stream Resolution" v-model="value.streamDivisor"
:list="streamResolutionList" @input="handleData('streamDivisor')"/>
</div>
@@ -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++) {