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

Merge branch 'ColorPick' into dev

Browse Source
This commit is contained in:
ori agranat
2019-12-03 19:19:44 +02:00
parent 1bf5ff9ee2 8a7a234ede
commit 9adde234b8
5 changed files with 216 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
chameleon-client/src/views/Camera.vue
View File

@@ -87,7 +87,7 @@
<div style="padding-left:30px">
<keep-alive>
<!-- vision component -->
<component v-model="pipeline" :is="selectedComponent" @update="$emit('save')"/>
<component v-model="pipeline" :is="selectedComponent" ref="component" @update="$emit('save')"/>
</keep-alive>
</div>
</v-col>
@@ -102,7 +102,7 @@
</v-tabs>
<!-- camera image stream -->
<div class="videoClass">
<img v-if="cameraList.length > 0" :src="streamAddress">
<img id="CameraStream" v-if="cameraList.length > 0" :src="streamAddress" @click="onImageClick" crossorigin="Anonymous"/>
<span v-else>No Cameras Are connected</span>
<h5 id="Point">{{point}}</h5>
</div>
@@ -157,6 +157,11 @@
CVinput
},
methods: {
onImageClick(event){
if(this.selectedTab ===1){
this.$refs.component.onClick(event);
}
},
toCameraNameChange() {
this.newCameraName = this.cameraList[this.currentCameraIndex];
this.isCameraNameEdit = true;