From 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:42:05 +0800
Subject: [PATCH] merge master
---
util/simpleCV.go | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 27e8196..d32691f 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -156,7 +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)
@@ -173,7 +176,12 @@
for i := 0; i < len(polygonIds); i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
+<<<<<<< HEAD
DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
+=======
+ logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
+ DrawAPolygon(&rook,polygon.Polygon,yellow)
+>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
}
}
}
@@ -195,6 +203,7 @@
defer rook.Close()
yellow := color.RGBA{255, 255, 0, 0}
+<<<<<<< HEAD
scale := float64(img.Width) / 960 // 鐢诲浘姣斾緥
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
for _,result := range results {
@@ -203,6 +212,18 @@
polygon := getPolygonById(polygonIds[i],cameraId)
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)
+>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
}
}
}
--
Gitblit v1.8.0