From 9d456d237fbf9f830d1a666f553579bc5ec9f479 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 22 六月 2019 17:57:40 +0800
Subject: [PATCH] 更改矩形的计算方式
---
main.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main.go b/main.go
index b293bc8..2e237a1 100644
--- a/main.go
+++ b/main.go
@@ -86,11 +86,11 @@
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽FACE 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)
}
@@ -99,7 +99,7 @@
faceParam := protomsg.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
for _, info := range faceParam.Faces {
@@ -116,11 +116,11 @@
}
// 灏嗗閮ㄤ紶杩涙潵鐨剅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{}
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