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

added pipeline action menu

Browse Source
This commit is contained in:
ori agranat
2019-10-02 00:14:37 +03:00
parent c0d10e7282
commit 48d327fddf
6 changed files with 87 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
New client/chameleon-client/package-lock.json generated
View File

@@ -13481,7 +13481,8 @@
},
"code-point-at": {
"version": "1.1.0",
"bundled": true
"bundled": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
@@ -13490,7 +13491,8 @@
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true
"bundled": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -13593,7 +13595,8 @@
},
"inherits": {
"version": "2.0.3",
"bundled": true
"bundled": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@@ -13603,6 +13606,7 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -13622,11 +13626,13 @@
},
"minimist": {
"version": "0.0.8",
"bundled": true
"bundled": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -13643,6 +13649,7 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -13715,7 +13722,8 @@
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true
"bundled": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -13725,6 +13733,7 @@
"once": {
"version": "1.4.0",
"bundled": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@@ -13830,6 +13839,7 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",

6
New client/chameleon-client/src/App.vue
View File

@@ -26,9 +26,12 @@
<script>
export default {
name: 'App',
components: {
},
data: () => ({
}),
};
</script>
@@ -56,5 +59,4 @@ export default {
span{
color: white;
}
</style>
</style>

31
New client/chameleon-client/src/components/cv-icon.vue Normal file
View File

@@ -0,0 +1,31 @@
<template>
<div>
<v-tooltip :right="right" :bottom="!right" nudge-right="10">
<template v-slot:activator="{ on }">
<v-icon @click="handleClick" v-on="on" :color="color">{{text}}</v-icon>
</template>
<span>{{tooltip}}</span>
</v-tooltip>
</div>
</template>
<script>
export default {
name: 'Icon',
props:['color','tooltip','text','right'],
data() {
return {
}
},
methods:{
handleClick(){
this.$emit('click');
}
}
}
</script>
<style lang="" scoped>
</style>

2
New client/chameleon-client/src/components/cv-select.vue
View File

@@ -1,7 +1,7 @@
<template>
<div>
<v-row align="center">
<v-col :cols="2">
<v-col :cols="3">
<span>{{name}}</span>
</v-col>
<v-col :cols="9">

4
New client/chameleon-client/src/main.js
View File

@@ -4,8 +4,8 @@ import router from './router'
import store from './store'
import vuetify from './plugins/vuetify';
import VueNativeSock from 'vue-native-websocket';
Vue.config.productionTip = false
// Vue.use(VueNativeSock,'ws://' + location.hostname + ':8888/websocket',{format:'JSON'});
Vue.config.productionTip = false;
// Vue.use(VueNativeSock,'ws://' + location.host + '/websocket',{format: 'json'});
new Vue({
router,
store,

38
New client/chameleon-client/src/views/Camera.vue
View File

@@ -7,12 +7,40 @@
<CVselect name="Camera" :list="[1,2,3]"></CVselect>
</div>
</v-col>
<v-col :cols="1">
<CVicon color="white" text="edit" tooltip="Edit camera name"></CVicon>
</v-col>
<v-col :cols="3" class="colsClass">
<CVselect name="Pipeline" :list="[1,2,3]"></CVselect>
</v-col>
<v-col :cols="2" class="colsClass">
<v-icon color="white" @click="test">add</v-icon>
<v-icon color="red darken-2" @click="test">delete</v-icon>
<v-col :cols="1" class="colsClass">
<v-menu offset-y dark auto>
<template v-slot:activator="{ on }">
<v-icon color="white" @click="test" v-on="on">menu</v-icon>
</template>
<v-list dense>
<v-list-item @click="test">
<v-list-item-title>
<CVicon color="white" :right="true" text="edit" tooltip="Edit pipeline name"></CVicon>
</v-list-item-title>
</v-list-item>
<v-list-item @click="test">
<v-list-item-title>
<CVicon color="white" :right="true" text="add" tooltip="Add new pipeline"></CVicon>
</v-list-item-title>
</v-list-item>
<v-list-item @click="test">
<v-list-item-title>
<CVicon color="red darken-2" :right="true" text="delete" tooltip="Delete pipeline"></CVicon>
</v-list-item-title>
</v-list-item>
<v-list-item @click="test">
<v-list-item-title>
<CVicon color="white" :right="true" text="mdi-content-copy" tooltip="Duplicate pipeline"></CVicon>
</v-list-item-title>
</v-list-item>
</v-list>
</v-menu>
</v-col>
</v-row>
</div>
@@ -48,6 +76,7 @@ import ThresholdTab from './CameraViewes/ThresholdTab'
import ContoursTab from './CameraViewes/ContoursTab'
import OutputTab from './CameraViewes/OutputTab'
import CVselect from '../components/cv-select'
import CVicon from '../components/cv-icon'
export default {
name: 'CameraTab',
components:{
@@ -55,7 +84,8 @@ import CVselect from '../components/cv-select'
ThresholdTab,
ContoursTab,
OutputTab,
CVselect
CVselect,
CVicon
},
methods:{
test(){