---

panlei

2019-12-16 aa7c8d325fb831d32934e5ad20f95965475292ac

 algorithm/middleware/readyData.go

@@ -2,7 +2,7 @@

import (
   "basic.com/pubsub/protomsg.git"
   logger "github.com/alecthomas/log4go"
   "basic.com/valib/logger.git"
   "github.com/golang/protobuf/proto"
   uuid "github.com/satori/go.uuid"
   "ruleprocess/ruleserver"
@@ -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("解包过程的异常捕获", err.(string))
      }

   }()
   // 反序列化数据得到sdk入参
   m := protomsg.SdkMessage{}
@@ -135,7 +134,7 @@
      logger.Info("--------------追踪之后人脸的个数：", len(faceParam.Faces))
      for _, info := range faceParam.Faces {
         //logger.Info("_______________________________________________第一次看相似值：",info.Pos.FAngle.Confidence*100)
         photoMap := structure.PhotoMap{structure.SourcePhoto{Id: strconv.Itoa(int(info.Pos.FaceID)) , Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence * 100), Type: "face", ThftRes: *(info.Result), Feature: info.Feats},nil}
         photoMap := structure.PhotoMap{structure.SourcePhoto{Id: strconv.Itoa(int(info.Pos.FaceID)) , Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence * 100), Type: "face", ThftRes: *(info.Result), Feature: info.Feats},structure.SourcePhoto{}}
         arg.Photo = append(arg.Photo, photoMap)
      }
      args.Sdkdata = append(args.Sdkdata, &arg)
@@ -162,7 +161,7 @@
      for _, info := range yoloParam.Infos {
         if info.Typ == 0 {
            //logger.Debug("-------------yolo的坐标有几个",info.RcObj)
            photoMap := structure.PhotoMap{structure.SourcePhoto{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, Type: "yolo",Id:strconv.Itoa(int(info.ObjID))},nil}
            photoMap := structure.PhotoMap{structure.SourcePhoto{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, Type: "yolo",Id:strconv.Itoa(int(info.ObjID))},structure.SourcePhoto{}}
            arg.Photo = append(arg.Photo, photoMap)
            yoloNum++
         }
@@ -193,7 +192,7 @@
         logger.Info("接收车牌数据：",info.FvdConf,info.NVehicleColor1,info.NPlateFlag,info.RcCarLocation)
         if info.NConfidence > 70 {
            logger.Info("车牌也符合的数据",info.FvdConf,info.NVehicleColor1,info.NPlateFlag,info.RcCarLocation,info.NConfidence,)
            photoMap := structure.PhotoMap{structure.SourcePhoto{Id: info.License,Score: float64(info.FvdConf)*100,Rects: rectFormat(info.RcCarLocation), Type: "plate", Car:info},nil}
            photoMap := structure.PhotoMap{structure.SourcePhoto{Id: info.License,Score: float64(info.FvdConf)*100,Rects: rectFormat(info.RcCarLocation), Type: "plate", Car:info},structure.SourcePhoto{}}
            arg.Photo = append(arg.Photo, photoMap)
         }
      }
@@ -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"},nil}
         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)