From e0c8467e92164100a9914e3fdcf35614b2b9bc51 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 07 十一月 2019 20:09:40 +0800
Subject: [PATCH] Merge branch 'module' of http://192.168.5.5:10010/r/ruleprocess into module
---
util/simpleCV.go | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 68200f3..a3fb8f6 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)
@@ -164,16 +163,14 @@
yellow := color.RGBA{255, 255, 0, 0}
red := color.RGBA{255, 0, 0, 0}
- scale := img.Width / 960 // 鐢诲浘姣斾緥
+ 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); i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
- logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
}
}
@@ -196,16 +193,13 @@
defer rook.Close()
yellow := color.RGBA{255, 255, 0, 0}
- scale := img.Width / 960 // 鐢诲浘姣斾緥
+ 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 != ""{
- logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
}
}
@@ -242,25 +236,21 @@
// 鏌ュ埌鎽勫儚鏈烘墍鏈夌殑鍖哄煙骞剁敾妗�
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
}
}
return protomsg.CameraPolygon{}
}
// 鍦ㄥ浘涓婄敾涓�涓
-func DrawAPolygon(rook *gocv.Mat,polygonString string, color color.RGBA,scale int32) {
+func DrawAPolygon(rook *gocv.Mat,polygonString string, color color.RGBA,scale float64) {
points := ruleserver.Json2points(polygonString)
- logger.Info("int32杞负float64锛�",float64(scale))
for index := 0; index < len(points); index++ {
if index == len(points)-1 { // 闂悎鍥惧舰
- gocv.Line(rook, image.Pt(int(points[index].X * float64(scale)), int(points[index].Y * float64(scale))), image.Pt(int(points[0].X * float64(scale)), int(points[0].Y * float64(scale))), 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 * float64(scale)), int(points[index].Y * float64(scale))), image.Pt(int(points[index+1].X * float64(scale)), int(points[index+1].Y * float64(scale))), 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