From d70a8135a61a989da488d814a28f461ab44a009a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 22 六月 2019 18:06:54 +0800
Subject: [PATCH] 注释看矩形数据
---
main.go | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/main.go b/main.go
index 6b5506e..d89013f 100644
--- a/main.go
+++ b/main.go
@@ -3,8 +3,9 @@
import (
"fmt"
"ruleprocess/ruleserver"
+ "ruleprocess/insertdata"
+
"sync"
- "analysis/work"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"github.com/golang/protobuf/proto"
@@ -43,7 +44,10 @@
ruleserver.MainJudge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+ //fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+
+ // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
+ insertdata.InsertToEs(resultMag)
}
}
}
@@ -77,30 +81,47 @@
arg.KeepRight = false
arg.IsStatic = false
fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
- for _, sdkinfo := range m.Tasklab.Sdkinfos {
+ for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
+ fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ //continue
}
for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects:rectFormat(info.RcObj, i.Width, i.Height), Score: float64(info.Prob)}
+ photoMap := ruleserver.PhotoMap{Rects:rectFormat(info.RcObj), Score: float64(info.Prob)}
arg.Photo = append(arg.Photo, photoMap)
}
}
+ if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ faceParam := protomsg.ParamFacePos{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ for _, info := range faceParam.Faces {
+ photoMap := ruleserver.PhotoMap{Rects:ruleserver.Rect{-1,-1,-1,-1}, Score: float64(info.Pos.Quality)}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ }
+ //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+
+ //}
+
}
return m
}
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
-func rectFormat(rcobj *protomsg.Rect, width int32, height int32) ruleserver.Rect {
+func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
rect := ruleserver.Rect{}
+ fmt.Println("鐪嬩竴涓嬩紶鍏ョ殑鐭╁舰鏁版嵁锛�",rcobj.Left,rcobj.Top,rcobj.Right,rcobj.Bottom)
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
- rect.Width = float64(width - rcobj.Left - rcobj.Right)
- rect.Height = float64(height - rcobj.Top - rcobj.Bottom)
+ rect.Width = float64(rcobj.Right - rcobj.Left)
+ rect.Height = float64(rcobj.Bottom - rcobj.Top)
return rect
}
--
Gitblit v1.8.0