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

first bug fixes

Browse Source
This commit is contained in:
ori
2019-08-09 02:21:52 -07:00
parent 7d5666bfb8
commit f61db90684
17 changed files with 230 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
chameleon-client/src/components/CameraTab.vue
View File

@@ -1,18 +1,95 @@
<template>
<h4>Camera</h4>
<div id="cameraTab" class="spacing">
<chselect title="select camera" :list="cameraList" Xkey="curr_camera"></chselect>
<Row type="flex" justify="start" align="middle" :gutter="1" class="spacing">
<Col span="4">
<h4>Resolution:</h4>
</Col>
<Col span="4">
<i-select v-model="resolution" size="small" >
<i-option v-for="(item,index) in resolutionList" :value="index" :key="index">{{item}}</i-option>
</i-select>
</Col>
</Row>
<Row type="flex" justify="start" align="middle" :gutter="1" class="spacing">
<Col span="4">
<h4>Diagonal FOV:</h4>
</Col>
<Col span="4">
<InputNumber :min="0" v-model="FOV" size="small"></InputNumber>
</Col>
</Row>
<Button type="primary" size="small" class="buttonClass spacing" v-on:click="socketSendAll">Save settings to current camera</Button>
<h4 class="spacing">Please Restart the computer Manually after saving all cameras</h4>
</div>
</template>
<script>
import chselect from './ch-select.vue'
import chIndexSelect from './ch-IndexSelect.vue'
export default {
name: '',
name: 'cameraTab',
components: {
chselect,
chIndexSelect
},
data() {
return {
}
},
methods: {
socketSendAll: function(){
this.$socket.sendObj({'resolution':this.resolution});
this.$socket.sendObj({'FOV':this.FOV});
}
},
computed: {
cameraList:{
get:function(){
return this.$store.state.cameraList;
}
},
resolutionList:{
get:function(){
return this.$store.state.resolutionList;
}
},
resolution:{
get: function(){
return this.$store.state.resolution;
},
set: function(value){
this.$store.commit('resolution',value);
}
},
FOV:{
get: function(){
return this.$store.state.FOV;
},
set: function(value){
this.$store.commit('FOV',value);
}
}
}
}
</script>
<style lang="" scoped>
<style scoped>
.title{
text-align:left;
color: aliceblue
}
.spacing{
margin-top: 10px;
}
.buttonClass{
display: flex;
text-align: left;
}
</style>

1
chameleon-client/src/components/InputTab.vue
View File

@@ -4,7 +4,6 @@
<chslider class="spacing" title="exposure" Xkey="exposure"></chslider>
<chslider class="spacing" title="Brightness" Xkey="brightness"></chslider>
<chselect class="spacing" title="Orientation" Xkey="orientation" :list="['Normal','Inverted']"></chselect>
<ch-index-select class="spacing" title="Resolution" Xkey="resolution" :list="resolutionList"></ch-index-select>
</div>
</template>

53
chameleon-client/src/components/SystemTab.vue
View File

@@ -6,31 +6,31 @@
<h4>Team Number:</h4>
</Col>
<col span="4">
<InputNumber :min="0" v-model="teamNum" size="small"></InputNumber>
<InputNumber :min="0" v-model="team_number" size="small"></InputNumber>
</col>
</row>
</div>
<Divider class="divdiv" orientation="left">Networking</Divider>
<div>
<RadioGroup v-model="connectionType" style="display: flex;">
<RadioGroup v-model="connection_type" style="display: flex;">
<Radio label="DHCP"></Radio>
<Radio label="Static"></Radio>
</RadioGroup>
<div class="ipSettings">
<row type="flex" justify="start" align="middle" class="spacing">
<Col span="4">
<h4>IP:</h4>
<h4>IP:</h4>
</Col>
<Col span="10">
<Input v-model="IP" size="small" :disabled="isConnection"></Input>
<Input v-model="ip" size="small" :disabled="isConnection"></Input>
</Col>
</row>
<row type="flex" justify="start" align="middle" class="spacing">
<Col span="4">
<h4>Gateway:</h4>
<h4>Gateway:</h4>
</Col>
<Col span="10">
<Input v-model="gateWay" size="small" :disabled="isConnection"></Input>
<Input v-model="gateway" size="small" :disabled="isConnection"></Input>
</Col>
</row>
<row type="flex" justify="start" align="middle" class="spacing">
@@ -38,7 +38,7 @@
<h4>Hostname:</h4>
</Col>
<Col span="10">
<Input v-model="hostName" size="small">
<Input v-model="hostname" size="small">
<span slot="prepend">http://Chameleon-Vision</span>
<span slot="append">.local</span>
</Input>
@@ -69,32 +69,33 @@
},
methods: {
socketSendAll: function(){
this.$socket.sendObj([
{'team_number':this.teamNum},
{'connection_type':this.connectionType},
{'ip':this.ip},
{'gateway':this.gateWay},
{'hostname':this.hostName}]);
this.$socket.sendObj(
{'change_general_settings_values':{
'team_number':this.team_number,
'connection_type':this.connection_type,
'ip':this.ip,
'gateway':this.gateway,
'hostname':this.hostname}});
}
},
computed: {
teamNum:{
team_number:{
get: function(){
return this.$store.state.teamValue;
return this.$store.state.team_number;
},
set: function(value){
this.$store.commit('teamValue',value);
this.$store.commit('team_number',value);
}
},
connectionType:{
connection_type:{
get: function(){
return this.$store.state.connectionType;
return this.$store.state.connection_type;
},
set: function(value){
this.$store.commit('connectionType',value);
this.$store.commit('connection_type',value);
}
},
IP:{
ip:{
get: function(){
return this.$store.state.ip;
},
@@ -102,20 +103,20 @@
this.$store.commit('ip',value);
}
},
gateWay:{
gateway:{
get: function(){
return this.$store.state.gateWay;
return this.$store.state.gateway;
},
set: function(value){
this.$store.commit('gateWay',value);
this.$store.commit('gateway',value);
}
},
hostName:{
hostname:{
get: function(){
return this.$store.state.hostName;
return this.$store.state.hostname;
},
set: function(value){
this.$store.commit('hostName',value);
this.$store.commit('hostname',value);
}
},
isConnection: function(){

3
chameleon-client/src/components/outputTab.vue
View File

@@ -2,7 +2,7 @@
<div id="OutputTab">
<chselect class="spacing" title="Sort Mode" Xkey="sort_mode"
:list="['Largest','Smallest','Highest','Lowest','Rightmost','Leftmost','Closest']"></chselect>
<h4>calibrate crosshair</h4>
<h6>calibrate crosshair</h6>
</div>
</template>
@@ -34,4 +34,5 @@ import chrange from './ch-range.vue'
.spacing{
margin-top: 20px;
}
</style>