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 | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 9e48691..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)
@@ -164,16 +168,20 @@
yellow := color.RGBA{255, 255, 0, 0}
red := color.RGBA{255, 0, 0, 0}
-
+ scale := float64(img.Width) / 960 // 鐢诲浘姣斾緥
+ logger.Info("width:",img.Width,"--鐢诲浘姣斾緥锛�",scale)
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
for _,result := range results {
polygonIds := strings.Split(result.AlarmPolygon,",")
- logger.Info("-----------------------鐪嬬湅鎶ヨ鍖哄煙id锛�",polygonIds)
- for i := 0; i < len(polygonIds)-1; i++ {
+ 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,16 @@
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,",")
+ for i := 0; i < len(polygonIds); i++ {
+ polygon := getPolygonById(polygonIds[i],cameraId)
+ if polygon.Polygon != "[]" && polygon.Polygon != ""{
+ DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
+=======
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
for _,result := range results {
@@ -205,6 +223,7 @@
if polygon.Polygon != "[]" && polygon.Polygon != ""{
logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
DrawAPolygon(&rook,polygon.Polygon,yellow)
+>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
}
}
}
@@ -241,20 +260,20 @@
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
for _, polygon := range cameraPolygons {
- if polygon.Id == polygonId {
+ if strings.Contains(polygonId,polygon.Id) {
return polygon
}
}
return protomsg.CameraPolygon{}
}
// 鍦ㄥ浘涓婄敾涓�涓
-func DrawAPolygon(rook *gocv.Mat,polygonString string, color color.RGBA) {
+func DrawAPolygon(rook *gocv.Mat,polygonString string, color color.RGBA,scale float64) {
points := ruleserver.Json2points(polygonString)
for index := 0; index < len(points); index++ {
if index == len(points)-1 { // 闂悎鍥惧舰
- gocv.Line(rook, image.Pt(int(points[index].X*1.33), int(points[index].Y*1.33)), image.Pt(int(points[0].X*1.33), int(points[0].Y*1.33)), color, 2)
+ gocv.Line(rook, image.Pt(int(points[index].X * scale), int(points[index].Y * scale)), image.Pt(int(points[0].X * scale), int(points[0].Y * scale)), color, 2)
} else {
- gocv.Line(rook, image.Pt(int(points[index].X*1.33), int(points[index].Y*1.33)), image.Pt(int(points[index+1].X*1.33), int(points[index+1].Y*1.33)), color, 2)
+ gocv.Line(rook, image.Pt(int(points[index].X * scale), int(points[index].Y * scale)), image.Pt(int(points[index+1].X * scale), int(points[index+1].Y * scale)), color, 2)
}
}
}
--
Gitblit v1.8.0