cleaned up single point calibration and bug fixed isBinary in driverMode

This commit is contained in:
ori agranat
2019-12-07 17:11:22 +02:00
parent aeb08442dd
commit 4213e28da4
4 changed files with 19 additions and 30 deletions

View File

@@ -40,13 +40,13 @@
if (isNaN(m) === false && isNaN(b) === false) {
this.sendSlope(m, b, true);
} else {
this.$emit('snackbar');
this.$emit('snackbar',"Points are too close");
}
this.pointA = undefined;
this.pointB = undefined;
}
},
sendSlope(m, b, valid) {
sendSlope(m, b) {
this.handleInput('dualTargetCalibrationM', m);
this.handleInput('dualTargetCalibrationB', b);
this.$emit('update');

View File

@@ -21,20 +21,11 @@
this.$emit('update');
},
takePoint() {
let hasNaN = false;
console.log(this.rawPoint);
for (let i = 0; i < this.rawPoint.length&&!hasNaN; i++) {
hasNaN = !(this.rawPoint[i]||this.rawPoint[i]===0);
}
if(!hasNaN){//if array doesnt have undefined values
console.log("sending points");
if (this.rawPoint[0] && this.rawPoint[1]) {
this.handleInput('point', this.rawPoint);
this.$emit('update');
}
else
{
console.log("sending error");
this.$emit('snackbar');
} else {
this.$emit('snackbar',"No target found");
}
}
}

View File

@@ -96,13 +96,15 @@
<!-- camera image tabs -->
<v-tabs background-color="#212121" dark height="48" slider-color="#4baf62" centered
style="padding-bottom:10px" v-model="isBinaryNumber"
@change="handleInput('isBinary',pipeline.isBinary)">
@change="handleInput('isBinary',pipeline.isBinary)" v-if="currentPipelineIndex !== 0">
<v-tab>Normal</v-tab>
<v-tab>Threshold</v-tab>
</v-tabs>
<div v-else style="height: 58px"></div>
<!-- camera image stream -->
<div class="videoClass">
<img id="CameraStream" v-if="cameraList.length > 0" :src="streamAddress" @click="onImageClick" crossorigin="Anonymous"/>
<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,8 +159,8 @@
CVinput
},
methods: {
onImageClick(event){
if(this.selectedTab ===1){
onImageClick(event) {
if (this.selectedTab === 1) {
this.$refs.component.onClick(event);
}
},
@@ -337,7 +339,7 @@
.videoClass img {
max-height: 70vh;
max-width:70%;
max-width: 70%;
width: 70%;
object-fit: cover;
vertical-align: middle;

View File

@@ -8,9 +8,9 @@
<v-divider dark color="white"/>
<CVselect name="Calibration Mode" v-model="value.calibrationMode" :list="['None','Single point','Dual point']"
@input="handleData('calibrationMode')"/>
<component :raw-point="rawPoint" :is="selectedComponent" @update="doUpdate" @snackbar="snackbar=true"/>
<component :raw-point="rawPoint" :is="selectedComponent" @update="doUpdate" @snackbar="showSnackbar"/>
<v-snackbar :timeout="3000" v-model="snackbar" top color="error">
<span style="color:#000">{{getErrorMsg()}}</span>
<span style="color:#000">{{snackbarText}}</span>
<v-btn color="black" text @click="snackbar = false">Close</v-btn>
</v-snackbar>
</div>
@@ -41,20 +41,16 @@
doUpdate() {
this.$emit('update')
},
getErrorMsg()
{
switch (this.value.calibrationMode) {
case 1:
return "No target found";
case 2:
return "Points are too close"
}
}
showSnackbar(message){
this.snackbarText = message;
this.snackbar = true;
},
},
data() {
return {
snackbar: false,
snackbarText:""
}
},
computed: {