From 0182f34e33252183cf4c9717db798e89052441eb Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 14:21:41 +0800
Subject: [PATCH] 根据摄像机真实配置的区域去画框并改动一些人脸部分的注释
---
util/simpleCV.go | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 53b2d03..ee7465e 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -15,6 +15,8 @@
"mime/multipart"
"net/http"
"os"
+ "ruleprocess/cache"
+ "ruleprocess/ruleserver"
"time"
)
@@ -159,7 +161,7 @@
}
}
-func DrawPolygonOnImage(img protomsg.Image)(maps map[string]interface{}, err0 error){
+func DrawPolygonOnImage(cameraId string, img protomsg.Image) (maps map[string]interface{}, err0 error) {
// draw the rook
//ddd, err := RetrieveROM("/home/user/workspace/ruleprocess/util/105.jpg")
//if err != nil {
@@ -181,14 +183,24 @@
// },
//}
//gocv.FillPoly(&rook, points, green)
- gocv.Line(&rook, image.Pt(100, 100), image.Pt(100, 800), green, 2)
- gocv.Line(&rook, image.Pt(100, 800), image.Pt(800, 800), green, 2)
- gocv.Line(&rook, image.Pt(800, 800), image.Pt(800, 100), green, 2)
- gocv.Line(&rook, image.Pt(800, 100), image.Pt(100, 100), green, 2)
+ // 鏌ュ埌鎽勫儚鏈烘墍鏈夌殑鍖哄煙骞剁敾妗�
+ var cameraPolygons []protomsg.CameraPolygon
+ cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
+ for _, polygon := range cameraPolygons {
+ points := ruleserver.Json2points(polygon.Polygon)
+ 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)), green, 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)), green, 2)
+ }
+
+ }
+ }
//return nil,nil
// 涓婁紶
- fdata,_ := gocv.IMEncode(".jpg",rook)
+ fdata, _ := gocv.IMEncode(".jpg", rook)
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err1 := writer.CreateFormFile("file", "fasjuierf")
--
Gitblit v1.8.0