From 6f1ae979d13028006ccdca01e310d2b5d2d53c5c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 15 八月 2019 16:27:44 +0800
Subject: [PATCH] 把数据定义模块儿提取出来
---
util/simpleCV.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index a546983..6ce97a2 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -161,8 +161,8 @@
//rook := gocv.IMRead("/home/user/workspace/ruleprocess/util/105.jpg",gocv.IMReadColor)
defer rook.Close()
+ yellow := color.RGBA{255, 255, 0, 0}
red := color.RGBA{255, 0, 0, 0}
- green := color.RGBA{0, 255, 0, 0}
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
for _,result := range results {
@@ -171,14 +171,14 @@
for i := 0; i < len(polygonIds)-1; i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
if polygon.Polygon != "[]" {
- DrawAPolygon(&rook,polygon.Polygon,red)
+ DrawAPolygon(&rook,polygon.Polygon,yellow)
}
}
}
// 鎶婄洰鏍囨鍑烘潵
for _,result := range results {
for _,rect := range result.Location {
- gocv.Rectangle(&rook, image.Rect(int(rect.X), int(rect.Y), int(rect.X+rect.Width), int(rect.Y+rect.Height)), green, 1)
+ gocv.Rectangle(&rook, image.Rect(int(rect.X), int(rect.Y), int(rect.X+rect.Width), int(rect.Y+rect.Height)), red, 1)
}
}
//return nil,nil
@@ -225,9 +225,9 @@
points := ruleserver.Json2points(polygonString)
for index := 0; index < len(points); index++ {
if index == len(points)-1 { // 闂悎鍥惧舰
- gocv.Line(rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[0].X), int(points[0].Y)), color, 2)
+ gocv.Line(rook, image.Pt(int(points[index].X*1.33), int(points[index].Y*1.33)), image.Pt(int(points[0].X*1.33), int(points[0].Y*1.33)), color, 2)
} else {
- gocv.Line(rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[index+1].X), int(points[index+1].Y)), color, 2)
+ gocv.Line(rook, image.Pt(int(points[index].X*1.33), int(points[index].Y*1.33)), image.Pt(int(points[index+1].X*1.33), int(points[index+1].Y*1.33)), color, 2)
}
}
}
--
Gitblit v1.8.0