From a54f40a8a52cc967fc95196ee2ef3d0f758b49ad Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 17:07:52 +0800
Subject: [PATCH] ---注释
---
ruleserver/ruleToformula.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 2b2138a..d3e7a8e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -180,10 +180,10 @@
// cameraPolygons := GetPolygons(arg.CameraId)
// list := AreaMapList{}
for _, polygon := range cameraPolygons {
- areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
+ areaMap := &AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
- (&areaMap).CountAreaObjs(arg)
- arg.AreaMapList = append(arg.AreaMapList, &areaMap)
+ areaMap.CountAreaObjs(arg)
+ arg.AreaMapList = append(arg.AreaMapList, areaMap)
}
}
@@ -364,11 +364,12 @@
// }
for _, obj := range arg.Photo {
+ log.Println("------------------鐪嬬湅sdkData鐨凱hoto鏁版嵁----------------",obj)
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
a.targetNum++
arg1 := Arg{obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.SdkName, obj.ThftRes, obj.Liker}
- //log.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
+ log.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, arg1)
a.filterData = append(a.filterData, arg1)
}
--
Gitblit v1.8.0