From 1858df993d5aff4101beda1040093fef356ee2cb Mon Sep 17 00:00:00 2001 From: ori agranat Date: Sun, 1 Dec 2019 22:06:06 +0200 Subject: [PATCH] bug for point data and bug fix for group contours --- chameleon-client/src/views/Camera.vue | 11 ++- chameleon-server/chameleon-vision.iml | 72 +++++++++++++++++++ .../pipeline/pipes/GroupContoursPipe.java | 4 -- 3 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 chameleon-server/chameleon-vision.iml diff --git a/chameleon-client/src/views/Camera.vue b/chameleon-client/src/views/Camera.vue index ae2480554..fd1129dc2 100644 --- a/chameleon-client/src/views/Camera.vue +++ b/chameleon-client/src/views/Camera.vue @@ -21,7 +21,8 @@ - @@ -252,7 +253,7 @@ }, selectedComponent: { get() { - if (this.currentPipelineIndex === 0){ + if (this.currentPipelineIndex === 0) { return "InputTab" } switch (this.selectedTab) { @@ -273,11 +274,7 @@ let p = this.$store.state.point.calculated; let fps = this.$store.state.point.fps; if (p !== undefined) { - try { - return `Pitch: ${parseFloat(p['pitch']).toFixed(2)}, Yaw: ${parseFloat(p['yaw']).toFixed(2)}, Area: ${p['area'].toFixed(2)}, FPS: ${fps.toFixed(2)}` - } catch (e) { - return "" - } + return `Pitch: ${parseFloat(p['pitch']).toFixed(2)}, Yaw: ${parseFloat(p['yaw']).toFixed(2)}, Area: ${parseFloat(p['area']).toFixed(2)}, FPS: ${parseFloat(fps).toFixed(2)}` } else { return undefined; } diff --git a/chameleon-server/chameleon-vision.iml b/chameleon-server/chameleon-vision.iml new file mode 100644 index 000000000..a3c362a46 --- /dev/null +++ b/chameleon-server/chameleon-vision.iml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java index d44f0f1ff..93b64f25b 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java @@ -128,17 +128,13 @@ public class GroupContoursPipe implements Pipe, List 0 && mB < 0) { return true; - } } break; } case Down: { if (intersectionY > massY) { - if (mA < 0 && mB > 0) { return true; - } } break;