From 0cbddb6f06c9ebbfe9151b5c3425906786b62a3e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 16:38:05 +0800
Subject: [PATCH] ---
---
util/simpleCV.go | 6 +++---
ruleserver/ruleToformula.go | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 33c7b08..84dbfcf 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -139,7 +139,7 @@
RuleText string // 鏂囧瓧鐗堣鍒欑粍
}
type LittleRuleResult struct {
- SdkName string //璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
+ SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
Result string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
Sort int32
}
@@ -329,14 +329,14 @@
sdkName := ""
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
- if groupRule.Rules[j].SdkId == sdkData.SdkId && sdkData.IsYolo { // 鍙褰晊olo绗﹀悎瑙勫垯鐨剆dk
+ if groupRule.Rules[j].SdkId == sdkData.SdkId && sdkData.IsYolo && !strings.Contains(sdkName,sdkData.SdkName) { // 鍙褰晊olo绗﹀悎瑙勫垯鐨剆dk 鍚屾椂瑕侀伩鍏嶉噸澶嶆嫾鎺�
sdkName = sdkName + "," + sdkData.SdkName
}
}
}
- // 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡 鍚庡姞锛氬彲鑳借繕涓嶅锛岃繕闇�瑕佸尯鍒嗚Е鍙戞姤璀︾殑瀵硅薄锛屽悗闈㈠線es鏁版嵁搴撴彃鏁版嵁鏃惰鐢�
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkName, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
- log.Println("-------------------缁撴灉鏍囩",args.RuleResult["yolo"].([]Result))
+ log.Println("-------------------yolo缁撴灉鏍囩",args.RuleResult["yolo"].([]Result))
+ log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["faces"].([]Arg))
return true
} else {
return false
diff --git a/util/simpleCV.go b/util/simpleCV.go
index ee7465e..c0d6558 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -173,7 +173,7 @@
//rook := gocv.IMRead("/home/user/workspace/ruleprocess/util/105.jpg",gocv.IMReadColor)
defer rook.Close()
- green := color.RGBA{0, 255, 0, 0}
+ red := color.RGBA{255, 0, 0, 0}
//points := [][]image.Point{
// {
// image.Pt(100., 100),
@@ -190,9 +190,9 @@
points := ruleserver.Json2points(polygon.Polygon)
for index := 0; index < len(points); index++ {
if index == len(points)-1 { // 闂悎鍥惧舰
- gocv.Line(&rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[0].X), int(points[0].Y)), green, 2)
+ gocv.Line(&rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[0].X), int(points[0].Y)), red, 2)
} else {
- gocv.Line(&rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[index+1].X), int(points[index+1].Y)), green, 2)
+ gocv.Line(&rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[index+1].X), int(points[index+1].Y)), red, 2)
}
}
--
Gitblit v1.8.0