bugfix for is binary in ui and target group

- css cleanup of main header
This commit is contained in:
ori agranat
2019-10-16 23:46:46 +03:00
parent dc2b738190
commit aaa9b98290
6 changed files with 13 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
package com.chameleonvision.vision;
public enum TargetGroup {
Single,Dual,Triple,Quadruple,Quintuple
Single,Dual
}

View File

@@ -18,7 +18,7 @@ public class CVProcess {
private final CameraValues cameraValues;
private Mat kernel = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(5, 5));
private Size blur = new Size(1,1);
private Size blur = new Size(2,2);
private Mat hsvImage = new Mat();
private List<MatOfPoint> foundContours = new ArrayList<>();
private Mat binaryMat = new Mat();

View File

@@ -1,11 +1,11 @@
<template>
<v-app>
<v-app-bar app clipped-left dark>
<v-app-bar app dense clipped-left dark>
<img class="imgClass" src="./assets/logo.png">
<v-toolbar-title id="title">Chameleon Vision</v-toolbar-title>
<div class="flex-grow-1"></div>
<v-toolbar-items>
<v-tabs dark height="64" slider-color="#4baf62">
<v-tabs dark height="48" slider-color="#4baf62">
<v-tab to="Vision">Vision</v-tab>
<v-tab to="Settings">Settings</v-tab>
</v-tabs>
@@ -24,7 +24,6 @@
</template>
<script>
import { async } from 'q';
export default {
name: 'App',
@@ -76,7 +75,7 @@ export default {
}
.imgClass{
width: auto;
height: 58px;
height: 45px;
vertical-align: middle;
padding-right: 5px;
}

View File

@@ -46,7 +46,7 @@
</div>
<v-row>
<v-col cols="6" class="colsClass">
<v-tabs fixed-tabs background-color="#212121" dark height="50" slider-color="#4baf62" v-model="selectedTab">
<v-tabs fixed-tabs background-color="#212121" dark height="48" slider-color="#4baf62" v-model="selectedTab">
<v-tab>Input</v-tab>
<v-tab>Threshold</v-tab>
<v-tab>Contours</v-tab>
@@ -58,7 +58,7 @@
</v-col>
<v-col cols="6" class="colsClass">
<div>
<v-tabs background-color="#212121" dark height="50" slider-color="#4baf62" centered style="padding-bottom:10px" v-model="pipeline.isBinary" @change="handleInput('isBinary',!!pipeline.isBinary)">
<v-tabs background-color="#212121" dark height="48" slider-color="#4baf62" centered style="padding-bottom:10px" v-model="isBinaryNumber" @change="handleInput('isBinary',!!pipeline.isBinary)">
<v-tab>Normal</v-tab>
<v-tab>Threshold</v-tab>
</v-tabs>
@@ -101,6 +101,11 @@ import CVicon from '../components/cv-icon'
}
},
computed:{
isBinaryNumber:{
get(){
return this.pipeline.isBinary ? 1:0
}
},
selectedComponent:{
get(){
switch(this.selectedTab){

View File

@@ -3,7 +3,7 @@
<CVrangeSlider v-model="value.area" name="Area" :min="0" :max="100" :step="0.1" @input="handleInput('area',value.area)"></CVrangeSlider>
<CVrangeSlider v-model="value.ratio" name="Ratio (W/H)" :min="0" :max="100" :step="0.1" @input="handleInput('ratio',value.ratio)"></CVrangeSlider>
<CVrangeSlider v-model="value.extent" name="Extent" :min="0" :max="100" @input="handleInput('extent',value.extent)"></CVrangeSlider>
<CVselect name="Target Group" :list="['Single','Dual','Triple','Quadruple','Quintuple']" v-model="value.targetGroup" @input="handleInput('targetGroup',value.targetGrouping)"></CVselect>
<CVselect name="Target Group" :list="['Single','Dual']" v-model="value.targetGroup" @input="handleInput('targetGroup',value.targetGroup)"></CVselect>
<CVselect name="Target Intersection" :list="['None','Up','Down','Left','Right']" :disabled="isDisabled" v-model="value.targetIntersection" @input="handleInput('targetIntersection',value.targetIntersection)"></CVselect>
</div>

View File

@@ -11,7 +11,6 @@
<script>
import CVselect from '../../components/cv-select'
import CVnumberinput from '../../components/cv-number-input'
import { get } from 'http';
export default {
name: 'CameraSettings',
components:{