From 8a190fbfbecc8f5aab8079982836ce73e2c28b15 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 18:15:44 +0800
Subject: [PATCH] ---注释
---
ruleserver/ruleToformula.go | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index d3e7a8e..1d37423 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -165,10 +165,14 @@
// 鏍规嵁id浠巑ap涓嬁鍒板尯鍩�
var cameraPolygons []*protomsg.CameraPolygon
for _, item := range data {
+ log.Println("-----鎷垮埌鐨勬墍鏈夊尯鍩熷拰鎽勫儚鏈篿d",data,"====",cameraId)
if item.CameraId == cameraId {
// 闇�瑕佹牴鎹瘮渚嬫妸鍓嶅彴鐢荤殑鍖哄煙鐨勫潗鏍囪浆鍖栦负鐩稿簲鎽勫儚鏈烘媿鎽勭殑鍥惧儚鐨勫ぇ灏� x鍧愭爣鍒嗗埆*image.width/椤甸潰鍖哄煙瀹� y鍧愭爣鍒嗗埆*image.height/椤甸潰鍖哄煙楂�
// 鍓嶅彴瀹介珮鍥哄畾
- cameraPolygons = append(cameraPolygons, &item)
+ log.Println("--------------------------鐪嬬湅绗﹀悎鏉′欢鐨勫尯鍩�",item)
+ if item.Type != "line" {
+ cameraPolygons = append(cameraPolygons, &item)
+ }
}
}
//log.Println("鏍规嵁鎽勫儚鏈篿d鏌ュ埌鐨勫尯鍩�", cameraPolygons, "--鍖哄煙鏁伴噺涓猴細", len(cameraPolygons))
@@ -364,7 +368,8 @@
// }
for _, obj := range arg.Photo {
- log.Println("------------------鐪嬬湅sdkData鐨凱hoto鏁版嵁----------------",obj)
+ 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++
--
Gitblit v1.8.0