From 1634b0789f15107b101237716bc9f9df1f3cd47b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 11:52:43 +0800
Subject: [PATCH] yaml改驼峰
---
util/simpleCV.go | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 86b724f..a546983 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -155,7 +155,7 @@
}
}
-func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.Result) (maps map[string]interface{}, err0 error) {
+func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.Result,url string) (maps map[string]interface{}, err0 error) {
rook, _ := gocv.NewMatFromBytes(int(img.Height), int(img.Width), gocv.MatTypeCV8UC3, img.Data)
//rook := gocv.IMRead("/home/user/workspace/ruleprocess/util/105.jpg",gocv.IMReadColor)
@@ -166,11 +166,11 @@
// 鍒嗗壊鍖哄煙id闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
for _,result := range results {
- polygonIds := strings.Split(result.AlarmPolygon,"")
+ 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 != "" {
+ if polygon.Polygon != "[]" {
DrawAPolygon(&rook,polygon.Polygon,red)
}
}
@@ -182,7 +182,7 @@
}
}
//return nil,nil
- maps,err0 = UploadFromMat(rook)
+ maps,err0 = UploadFromMat(url,rook)
return
}
@@ -214,7 +214,6 @@
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
for _, polygon := range cameraPolygons {
- logger.Info("鐪嬬湅缂撳瓨涓煡鍑虹殑鍖哄煙鍜屼紶杩涙潵鐨�",polygon.Id,polygonId)
if polygon.Id == polygonId {
return polygon
}
--
Gitblit v1.8.0