From ee52bd0ed3a2e6f02476044f8a9df8a056537f89 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 18:50:42 +0800
Subject: [PATCH] 区域传值改为值传递，指针传递有问题
---
ruleserver/ruleToformula.go | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c5aae7c..e100a3e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -168,7 +168,7 @@
if item.CameraId == cameraId && item.Type != "line" {
// 闇�瑕佹牴鎹瘮渚嬫妸鍓嶅彴鐢荤殑鍖哄煙鐨勫潗鏍囪浆鍖栦负鐩稿簲鎽勫儚鏈烘媿鎽勭殑鍥惧儚鐨勫ぇ灏� x鍧愭爣鍒嗗埆*image.width/椤甸潰鍖哄煙瀹� y鍧愭爣鍒嗗埆*image.height/椤甸潰鍖哄煙楂�
// 鍓嶅彴瀹介珮鍥哄畾
- log.Println("------------绗﹀悎鏉′欢鐨勫尯鍩燂細",item)
+ //log.Println("------------绗﹀悎鏉′欢鐨勫尯鍩燂細",item)
cameraPolygons = append(cameraPolygons, item)
}
}
@@ -179,7 +179,7 @@
// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
for _, polygon := range cameraPolygons {
- log.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩", polygon)
+ //log.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩", polygon)
areaMap := &AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
areaMap.CountAreaObjs(arg)
@@ -364,7 +364,6 @@
// }
for _, obj := range arg.Photo {
- log.Println("-------------------鐪嬬湅areajson-------------", a.areaJson)
log.Println("------------------鐪嬬湅sdkData鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
--
Gitblit v1.8.0