From 854d072ce2203f5a8dba2bd878578def95ec9f21 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 17:34:22 +0800
Subject: [PATCH] 把报警等级转为string版本
---
util/simpleCV.go | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 4fad3c9..c0d6558 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -1,6 +1,7 @@
package util
import (
+ "basic.com/pubsub/protomsg.git"
"bufio"
"bytes"
"encoding/json"
@@ -14,6 +15,8 @@
"mime/multipart"
"net/http"
"os"
+ "ruleprocess/cache"
+ "ruleprocess/ruleserver"
"time"
)
@@ -158,19 +161,19 @@
}
}
-func DrawPolygonOnImage()(maps map[string]interface{}, err0 error){
+func DrawPolygonOnImage(cameraId string, img protomsg.Image) (maps map[string]interface{}, err0 error) {
// draw the rook
- ddd, err := RetrieveROM("/home/user/workspace/ruleprocess/util/105.jpg")
- if err != nil {
- fmt.Println("瑙ｇ爜鏈夎",err)
- }
- bbb := bytes.NewBuffer(ddd) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
- rook,_ := gocv.IMDecode(bbb.Bytes(),gocv.IMReadColor)
- //rook, _ := gocv.NewMatFromBytes(500, 500, gocv.MatTypeCV8UC3, bates)
+ //ddd, err := RetrieveROM("/home/user/workspace/ruleprocess/util/105.jpg")
+ //if err != nil {
+ // fmt.Println("瑙ｇ爜鏈夎",err)
+ //}
+ //bbb := bytes.NewBuffer(ddd) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
+ //rook,_ := gocv.IMDecode(bbb.Bytes(),gocv.IMReadColor)
+ 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()
- green := color.RGBA{0, 255, 0, 0}
+ red := color.RGBA{255, 0, 0, 0}
//points := [][]image.Point{
// {
// image.Pt(100., 100),
@@ -180,14 +183,24 @@
// },
//}
//gocv.FillPoly(&rook, points, green)
- gocv.Line(&rook, image.Pt(100, 100), image.Pt(100, 250), green, 2)
- gocv.Line(&rook, image.Pt(100, 250), image.Pt(250, 250), green, 2)
- gocv.Line(&rook, image.Pt(250, 250), image.Pt(250, 100), green, 2)
- gocv.Line(&rook, image.Pt(250, 100), image.Pt(100, 100), green, 2)
+ // 鏌ュ埌鎽勫儚鏈烘墍鏈夌殑鍖哄煙骞剁敾妗�
+ var cameraPolygons []protomsg.CameraPolygon
+ cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
+ for _, polygon := range cameraPolygons {
+ points := ruleserver.Json2points(polygon.Polygon)
+ for index := 0; index < len(points); index++ {
+ if index == len(points)-1 { // 闂悎鍥惧舰
+ gocv.Line(&rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[0].X), int(points[0].Y)), red, 2)
+ } else {
+ gocv.Line(&rook, image.Pt(int(points[index].X), int(points[index].Y)), image.Pt(int(points[index+1].X), int(points[index+1].Y)), red, 2)
+ }
+
+ }
+ }
//return nil,nil
// 涓婁紶
- fdata,_ := gocv.IMEncode(".jpg",rook)
+ fdata, _ := gocv.IMEncode(".jpg", rook)
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err1 := writer.CreateFormFile("file", "fasjuierf")
--
Gitblit v1.8.0