From 365f18d49473cb50a66c9af92de1d6794521cac8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 07 十一月 2019 20:07:25 +0800
Subject: [PATCH] XMerge branch 'module' of http://192.168.5.5:10010/r/ruleprocess into module
---
util/simpleCV.go | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index a3ca1c3..d32691f 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -156,6 +156,10 @@
}
}
+<<<<<<< HEAD
+
+=======
+>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
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,12 +173,15 @@
// 鍒嗗壊鍖哄煙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)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
- logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
+<<<<<<< HEAD
DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
+=======
+ logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
+ DrawAPolygon(&rook,polygon.Polygon,yellow)
+>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
}
}
}
@@ -196,17 +203,27 @@
defer rook.Close()
yellow := color.RGBA{255, 255, 0, 0}
+<<<<<<< HEAD
scale := float64(img.Width) / 960 // 鐢诲浘姣斾緥
// 鍒嗗壊鍖哄煙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 != ""{
+ DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
+=======
+
+ // 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
+ for _,result := range results {
+ polygonIds := strings.Split(result.AlarmPolygon,",")
+ logger.Info("-----------------------鐪嬬湅鎶ヨ鍖哄煙id锛�",polygonIds)
+ for i := 0; i < len(polygonIds)-1; i++ {
+ polygon := getPolygonById(polygonIds[i],cameraId)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
- DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
+ DrawAPolygon(&rook,polygon.Polygon,yellow)
+>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
}
}
}
@@ -242,11 +259,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