From d81dee97316758a8d7910cf337667cbe4a3eabed Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 10:51:10 +0800
Subject: [PATCH] 放开yolo，加个上传yolo退出
---
util/simpleCV.go | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index ee7465e..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("瑙ｇ爜鏈夎",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()
- green := color.RGBA{0, 255, 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)
+ red := color.RGBA{255, 0, 0, 0}
// 鏌ュ埌鎽勫儚鏈烘墍鏈夌殑鍖哄煙骞剁敾妗�
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
@@ -190,14 +175,19 @@
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)
+ gocv.Line(&rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[0].X), int(points[0].Y)), red, 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)
+ 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)), red, 2)
}
}
}
-
+ // 鎶婄洰鏍囨鍑烘潵
+ 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