From 0d95e05cf47aa7b24a57a673db46d5607016016c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 11:11:14 +0800
Subject: [PATCH] 目标加timeLable
---
labelFilter/readyDataForLabel.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 5c792e1..6dd9034 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -13,14 +13,14 @@
CameraAddr string
TaskId string
Time string
- Persons []structure.FaceResult
+ Persons []structure.Result
DefenceLevel []int32
}
// 鎶婃暟鎹閰嶅埌label
func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
- logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0)
- logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0)
- if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) { // 寰楁湁浜鸿劯鎴栬�厃olo瑙勫垯鎵嶅彲浠�
+ if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0) ||
+ (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) ||
+ (result.RuleResult["target"] != nil && len(result.RuleResult["target"].([]structure.Result)) > 0){ // 寰楁湁浜鸿劯鎴栬�厃olo瑙勫垯鎵嶅彲浠�
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鎶ヨ鐨勫彲浠ユ帹閫佺殑
flag := false
@@ -30,7 +30,7 @@
flag = true
}
}
- if flag || (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0){
+ if flag || (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0){
logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
@@ -41,8 +41,8 @@
label.CameraAddr = camera.Addr
label.TaskId = result.Tasklab.Taskid
label.Time = time.Now().Format("2006-01-02 15:04:05")
- if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0 {
- for _,faceGroup := range result.RuleResult["face"].([]structure.FaceResult) {
+ if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0 {
+ for _,faceGroup := range result.RuleResult["face"].([]structure.Result) {
label.Persons = append(label.Persons,faceGroup)
label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
}
--
Gitblit v1.8.0