From 98615ba39c6262cdd83396210f79dc330238f8ac Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 18:20:57 +0800
Subject: [PATCH] ---注释
---
ruleserver/ruleToformula.go | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 2b2138a..4462cf0 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -168,7 +168,9 @@
if item.CameraId == cameraId {
// 闇�瑕佹牴鎹瘮渚嬫妸鍓嶅彴鐢荤殑鍖哄煙鐨勫潗鏍囪浆鍖栦负鐩稿簲鎽勫儚鏈烘媿鎽勭殑鍥惧儚鐨勫ぇ灏� x鍧愭爣鍒嗗埆*image.width/椤甸潰鍖哄煙瀹� y鍧愭爣鍒嗗埆*image.height/椤甸潰鍖哄煙楂�
// 鍓嶅彴瀹介珮鍥哄畾
- cameraPolygons = append(cameraPolygons, &item)
+ if item.Type == "rect" {
+ cameraPolygons = append(cameraPolygons, &item)
+ }
}
}
//log.Println("鏍规嵁鎽勫儚鏈篿d鏌ュ埌鐨勫尯鍩�", cameraPolygons, "--鍖哄煙鏁伴噺涓猴細", len(cameraPolygons))
@@ -180,10 +182,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 +366,13 @@
// }
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) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
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