From 9a50745cd75d4bd7ecd27f7ce9e666c5b85746c9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 12 七月 2019 15:42:46 +0800
Subject: [PATCH] 画框时判断全部区域[C
---
util/simpleCV.go | 2 +-
ruleserver/ruleToformula.go | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 7fbf941..0ff5a7d 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -714,7 +714,7 @@
for _, obj := range am.filterData {
for index := 0; index < len(obj.Liker); {
// 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
- logger.Warn("=======================鐩镐技鍊硷細", float64(obj.Liker[index].CompareScore*100))
+ logger.Debug("=======================鐩镐技鍊硷細", float64(obj.Liker[index].CompareScore*100))
if float64(obj.Liker[index].CompareScore*100) < argValue {
// Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
obj.Liker = append(obj.Liker[:index], obj.Liker[index+1:]...)
@@ -742,7 +742,7 @@
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- logger.Info("---------------------------缁堜簬绛夊埌浣�")
+ //logger.Info("---------------------------缁堜簬绛夊埌浣�")
var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
@@ -751,7 +751,7 @@
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
- logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs閲岀殑鏁伴噺锛�", len(args))
+ //logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs閲岀殑鏁伴噺锛�", len(args))
for _, arg := range args {
var formula string
if rule.SdkArgAlias == "score" {
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 74c59d3..5b33210 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -170,7 +170,7 @@
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)
}
}
--
Gitblit v1.8.0