From 4749d09f155ccffeff8e473aa1a9d021be7dfcba Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 18:22:08 +0800
Subject: [PATCH] 更新protomsg包

---
 util/simpleCV.go |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/util/simpleCV.go b/util/simpleCV.go
index c0d6558..04c9340 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -161,28 +161,13 @@
 	}
 }
 
-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 {
-	//	fmt.Println("瑙g爜鏈夎",err)
-	//}
-	//bbb := bytes.NewBuffer(ddd)  // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
-	//rook,_ := gocv.IMDecode(bbb.Bytes(),gocv.IMReadColor)
+func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.Result) (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)
 	defer rook.Close()
 
 	red := color.RGBA{255, 0, 0, 0}
-	//points := [][]image.Point{
-	//	{
-	//		image.Pt(100., 100),
-	//		image.Pt(100., 400),
-	//		image.Pt(400, 400),
-	//		image.Pt(400, 100),
-	//	},
-	//}
-	//gocv.FillPoly(&rook, points, green)
 	// 鏌ュ埌鎽勫儚鏈烘墍鏈夌殑鍖哄煙骞剁敾妗�
 	var cameraPolygons []protomsg.CameraPolygon
 	cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
@@ -197,7 +182,12 @@
 
 		}
 	}
-
+	// 鎶婄洰鏍囨鍑烘潵
+	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)), red, 1)
+		}
+	}
 	//return nil,nil
 	// 涓婁紶
 	fdata, _ := gocv.IMEncode(".jpg", rook)

--
Gitblit v1.8.0