From 5913d9cfae97f9b15721c4facf9ceb8749da350e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 13:52:08 +0800
Subject: [PATCH] 占比乘以100
---
main.go | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/main.go b/main.go
index a5fc975..8579e29 100644
--- a/main.go
+++ b/main.go
@@ -4,6 +4,7 @@
"fmt"
"ruleprocess/insertdata"
"ruleprocess/ruleserver"
+ "ruleprocess/util"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
@@ -69,7 +70,7 @@
}
arg.CameraId = m.Cid
arg.TaskId = m.Tasklab.Taskid
- bdata, err := UnCompress(m.Data)
+ bdata, err := util.UnCompress(m.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
@@ -80,12 +81,11 @@
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
arg.KeepRight = false
arg.IsStatic = false
- fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
- fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Caddr)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
@@ -93,8 +93,10 @@
//continue
}
for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
+ if info.Typ == 0 {
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
}
} else {
continue
@@ -104,6 +106,7 @@
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
+ fmt.Println("----------------------------------------------------",m.Caddr)
faceParam := protomsg.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
--
Gitblit v1.8.0