~jinersong/ruleprocess.git

			@@ -155,7 +155,6 @@
			}
			}
			}

			func DrawPolygonOnImageForYolo(cameraId string, img protomsg.Image, results []structure.Result,url string) (maps map[string]interface{}, err0 error) {

			rook, _ := gocv.NewMatFromBytes(int(img.Height), int(img.Width), gocv.MatTypeCV8UC3, img.Data)
			@@ -164,24 +163,23 @@

			yellow := color.RGBA{255, 255, 0, 0}
			red := color.RGBA{255, 0, 0, 0}
			scale := img.Width / 960 // 画图比例
			scale := float64(img.Width) / 960 // 画图比例
			logger.Info("width:",img.Width,"--画图比例：",scale)
			// 分割区域id集合并根据id查询区域然后画框
			for _,result := range results {
			polygonIds := strings.Split(result.AlarmPolygon,",")
			logger.Info("-----------------------看看报警区域id：",polygonIds)
			logger.Info("区域ID：",result.AlarmPolygon,polygonIds)
			for i := 0; i < len(polygonIds); i++ {
			polygon := getPolygonById(polygonIds[i],cameraId)
			if polygon.Polygon != "[]" && polygon.Polygon != ""{
			logger.Debug("所画区域：",polygon.Polygon)
			DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
			}
			}
			}
			// 把目标框出来
			for _,result := range results {
			for _,rect := range result.Location {
			gocv.Rectangle(&rook, image.Rect(int(rect.X), int(rect.Y), int(rect.X+rect.Width), int(rect.Y+rect.Height)), red, 1)
			for _,rect := range result.AlarmObj {
			gocv.Rectangle(&rook, image.Rect(int(rect.Location.X), int(rect.Location.Y), int(rect.Location.X+rect.Location.Width), int(rect.Location.Y+rect.Location.Height)), red, 1)
			}
			}
			//return nil,nil
			@@ -189,23 +187,20 @@
			return
			}

			func DrawPolygonOnImageForFace(cameraId string, img protomsg.Image, results []structure.FaceResult,url string) (maps map[string]interface{}, err0 error) {
			func DrawPolygonOnImageForFace(cameraId string, img protomsg.Image, results []structure.Result,url string) (maps map[string]interface{}, err0 error) {

			rook, _ := gocv.NewMatFromBytes(int(img.Height), int(img.Width), gocv.MatTypeCV8UC3, img.Data)
			//rook := gocv.IMRead("/home/user/workspace/ruleprocess/util/105.jpg",gocv.IMReadColor)
			defer rook.Close()

			yellow := color.RGBA{255, 255, 0, 0}
			scale := img.Width / 960 // 画图比例
			scale := float64(img.Width) / 960 // 画图比例
			// 分割区域id集合并根据id查询区域然后画框
			for _,result := range results {
			polygonIds := strings.Split(result.AlarmPolygon,",")
			logger.Info("-----------------------看看报警区域id：",polygonIds)
			for i := 0; i < len(polygonIds); i++ {
			polygon := getPolygonById(polygonIds[i],cameraId)
			logger.Info("----查到的报警框：",polygon)
			if polygon.Polygon != "[]" && polygon.Polygon != ""{
			logger.Debug("所画区域：",polygon.Polygon)
			DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
			}
			}
			@@ -242,25 +237,21 @@
			// 查到摄像机所有的区域并画框
			var cameraPolygons []protomsg.CameraPolygon
			cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
			logger.Info("根据id查到的报警框：",cameraPolygons)
			for _, polygon := range cameraPolygons {
			logger.Info("查到的区域id：",polygon.Id,"--要匹配的数据id：",polygonId,"---是否相等：",strings.Contains(polygonId,polygon.Id))
			if strings.Contains(polygonId,polygon.Id) {
			logger.Info("进来即相等")
			return polygon
			}
			}
			return protomsg.CameraPolygon{}
			}
			// 在图上画一个框
			func DrawAPolygon(rook *gocv.Mat,polygonString string, color color.RGBA,scale int32) {
			func DrawAPolygon(rook *gocv.Mat,polygonString string, color color.RGBA,scale float64) {
			points := ruleserver.Json2points(polygonString)
			logger.Info("int32转为float64：",float64(scale))
			for index := 0; index < len(points); index++ {
			if index == len(points)-1 { // 闭合图形
			gocv.Line(rook, image.Pt(int(points[index].X * float64(scale)), int(points[index].Y * float64(scale))), image.Pt(int(points[0].X * float64(scale)), int(points[0].Y * float64(scale))), color, 2)
			gocv.Line(rook, image.Pt(int(points[index].X * scale), int(points[index].Y * scale)), image.Pt(int(points[0].X * scale), int(points[0].Y * scale)), color, 2)
			} else {
			gocv.Line(rook, image.Pt(int(points[index].X * float64(scale)), int(points[index].Y * float64(scale))), image.Pt(int(points[index+1].X * float64(scale)), int(points[index+1].Y * float64(scale))), color, 2)
			gocv.Line(rook, image.Pt(int(points[index].X * scale), int(points[index].Y * scale)), image.Pt(int(points[index+1].X * scale), int(points[index+1].Y * scale)), color, 2)
			}
			}
			}