~jinersong/ruleprocess.git

			@@ -155,11 +155,6 @@
			}
			}
			}

			<<<<<<< HEAD

			=======
			>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
			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)
			@@ -176,12 +171,7 @@
			for i := 0; i < len(polygonIds); i++ {
			polygon := getPolygonById(polygonIds[i],cameraId)
			if polygon.Polygon != "[]" && polygon.Polygon != ""{
			<<<<<<< HEAD
			DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
			=======
			logger.Debug("所画区域：",polygon.Polygon)
			DrawAPolygon(&rook,polygon.Polygon,yellow)
			>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
			}
			}
			}
			@@ -203,7 +193,6 @@
			defer rook.Close()

			yellow := color.RGBA{255, 255, 0, 0}
			<<<<<<< HEAD
			scale := float64(img.Width) / 960 // 画图比例
			// 分割区域id集合并根据id查询区域然后画框
			for _,result := range results {
			@@ -212,18 +201,6 @@
			polygon := getPolygonById(polygonIds[i],cameraId)
			if polygon.Polygon != "[]" && polygon.Polygon != ""{
			DrawAPolygon(&rook,polygon.Polygon,yellow,scale)
			=======

			// 分割区域id集合并根据id查询区域然后画框
			for _,result := range results {
			polygonIds := strings.Split(result.AlarmPolygon,",")
			logger.Info("-----------------------看看报警区域id：",polygonIds)
			for i := 0; i < len(polygonIds)-1; i++ {
			polygon := getPolygonById(polygonIds[i],cameraId)
			if polygon.Polygon != "[]" && polygon.Polygon != ""{
			logger.Debug("所画区域：",polygon.Polygon)
			DrawAPolygon(&rook,polygon.Polygon,yellow)
			>>>>>>> a87978244bbb81f2fa7610560ed190acbaa422f8
			}
			}
			}