From 153d80d308e1db97c0b2553a4ee9758c237ac2ba Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 11:35:07 +0800
Subject: [PATCH] 添加拥挤算法
---
util/simpleCV.go | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 44f6500..21e551f 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -11,6 +11,7 @@
"ruleprocess/cache"
"ruleprocess/logger"
"ruleprocess/ruleserver"
+ "ruleprocess/structure"
"strings"
)
@@ -155,7 +156,7 @@
}
}
-func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.Result,url string) (maps map[string]interface{}, err0 error) {
+func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []structure.Result,url string) (maps map[string]interface{}, err0 error) {
rook, _ := gocv.NewMatFromBytes(int(img.Height), int(img.Width), gocv.MatTypeCV8UC3, img.Data)
//rook := gocv.IMRead("/home/user/workspace/ruleprocess/util/105.jpg",gocv.IMReadColor)
@@ -225,9 +226,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