From 466947c1eeda6938ab6ef11497f6c8a96a574920 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 13 十一月 2019 14:46:57 +0800
Subject: [PATCH] targetLocation
---
util/simpleCV.go | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index a3ca1c3..bb34716 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -155,7 +155,6 @@
}
}
}
-
func DrawPolygonOnImageForYolo(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)
@@ -169,11 +168,10 @@
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
for _,result := range results {
polygonIds := strings.Split(result.AlarmPolygon,",")
- logger.Info("-----------------------鐪嬬湅鎶ヨ鍖哄煙id锛�",polygonIds)
+ logger.Info("鍖哄煙ID锛�",result.AlarmPolygon,polygonIds)
for i := 0; i < len(polygonIds); i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
- logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
}
}
@@ -200,12 +198,9 @@
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
for _,result := range results {
polygonIds := strings.Split(result.AlarmPolygon,",")
- logger.Info("-----------------------鐪嬬湅鎶ヨ鍖哄煙id锛�",polygonIds)
for i := 0; i < len(polygonIds); i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
- logger.Info("----鏌ュ埌鐨勬姤璀︽锛�",polygon)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
- logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
}
}
@@ -242,11 +237,8 @@
// 鏌ュ埌鎽勫儚鏈烘墍鏈夌殑鍖哄煙骞剁敾妗�
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
- logger.Info("鏍规嵁id鏌ュ埌鐨勬姤璀︽锛�",cameraPolygons)
for _, polygon := range cameraPolygons {
- logger.Info("鏌ュ埌鐨勫尯鍩焛d锛�",polygon.Id,"--瑕佸尮閰嶇殑鏁版嵁id锛�",polygonId,"---鏄惁鐩哥瓑锛�",strings.Contains(polygonId,polygon.Id))
if strings.Contains(polygonId,polygon.Id) {
- logger.Info("杩涙潵鍗崇浉绛�")
return polygon
}
}
--
Gitblit v1.8.0