From 5576abe657242b17372d5840c234538446913ac8 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 24 七月 2019 10:29:51 +0800
Subject: [PATCH] 加传id
---
util/simpleCV.go | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 9c41586..1915cf7 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -155,13 +155,13 @@
}
}
-func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.Result) (maps map[string]interface{}, err0 error) {
+func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.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)
defer rook.Close()
- red := color.RGBA{255, 0, 0, 0}
+ yellow := color.RGBA{255, 255, 0, 0}
green := color.RGBA{0, 255, 0, 0}
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
@@ -170,8 +170,8 @@
logger.Info("-----------------------鐪嬬湅鎶ヨ鍖哄煙id锛�",polygonIds)
for i := 0; i < len(polygonIds)-1; i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
- if polygon.Polygon != "" {
- DrawAPolygon(&rook,polygon.Polygon,red)
+ if polygon.Polygon != "[]" {
+ DrawAPolygon(&rook,polygon.Polygon,yellow)
}
}
}
@@ -182,7 +182,7 @@
}
}
//return nil,nil
- maps,err0 = UploadFromMat(rook)
+ maps,err0 = UploadFromMat(url,rook)
return
}
@@ -214,7 +214,6 @@
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
for _, polygon := range cameraPolygons {
- logger.Info("鐪嬬湅缂撳瓨涓煡鍑虹殑鍖哄煙鍜屼紶杩涙潵鐨�",polygon.Id,polygonId)
if polygon.Id == polygonId {
return polygon
}
--
Gitblit v1.8.0