From 1570637a67ec0849dbe53cff570c8691a9cff49b Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期一, 16 十二月 2019 13:55:26 +0800 Subject: [PATCH] arg新加一个参数 --- algorithm/middleware/readyData.go | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/algorithm/middleware/readyData.go b/algorithm/middleware/readyData.go index 5ea0c97..a25f62d 100644 --- a/algorithm/middleware/readyData.go +++ b/algorithm/middleware/readyData.go @@ -21,7 +21,7 @@ func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) { a.TargetNum = 0 - threshold := 70.0 // 鐩镐技搴� + threshold := 0.0 // 鐩镐技搴� intersectionper := 20.0 // 鍗犳瘮 size := 0.0 // 灏哄 @@ -35,7 +35,7 @@ // 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁� a.TargetNum++ uuid := uuid.NewV4().String() - arg1 := structure.Arg{structure.SourceArg{obj.Id,uuid,obj.Score, ruleserver.PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.Type, obj.Rects, obj.Car,obj.Feature,obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}},structure.SourceArg{}} + arg1 := structure.Arg{structure.SourceArg{obj.Id,uuid,obj.Score, ruleserver.PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.Type, obj.Rects, obj.Car,obj.Feature,obj.BodyFeature,obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}},structure.SourceArg{}} //logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1) a.Args = append(a.Args, &arg1) a.FilterData = append(a.FilterData, &arg1) @@ -80,7 +80,6 @@ if err := recover(); err != nil { logger.Info("瑙e寘杩囩▼鐨勫紓甯告崟鑾�", err.(string)) } - }() // 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬 m := protomsg.SdkMessage{} @@ -220,10 +219,8 @@ return } for _, info := range Track.Result { - logger.Info("鎺ユ敹璺熻釜鏁版嵁锛�",info.Id,info.Confidence) - photoMap := structure.PhotoMap{structure.SourcePhoto{Id: strconv.Itoa(int(info.Id)),Score: float64(info.Confidence)*100,Rects: rectFormat(info.RcHuman), Type: "track"},structure.SourcePhoto{}} - //FacePush2Body(&photoMap,m.Tasklab.Sdkinfos) - logger.Info("缁勮鍚庣殑璺熻釜鏁版嵁锛�",photoMap) + logger.Info("鎺ユ敹璺熻釜鏁版嵁锛�",info.Id,info.Confidence,info.Feature) + photoMap := structure.PhotoMap{structure.SourcePhoto{Id: strconv.Itoa(int(info.Id)),Score: float64(info.Confidence)*100,Rects: rectFormat(info.RcHuman), Type: "track",BodyFeature: info.Feature},structure.SourcePhoto{}} arg.Photo = append(arg.Photo, photoMap) } args.Sdkdata = append(args.Sdkdata, &arg) -- Gitblit v1.8.0