From 548d788436bcad77267e310f4dac9fac48a2ca12 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 02 七月 2019 11:45:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/ruleprocess
---
util/simpleCV.go | 18 +++++++++---------
insertdata/insertDataToEs.go | 9 +++++++--
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 3c77b8e..c8319c6 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -197,8 +197,13 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ resp, err =util.DrawPolygonOnImage(i)
+ if err != nil {
+ log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
+ }else{
+ log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ }
} else {
isAlarm = "0"
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
diff --git a/util/simpleCV.go b/util/simpleCV.go
index aaaf30b..53b2d03 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"
@@ -158,17 +159,16 @@
}
}
-func DrawPolygonOnImage()(maps map[string]interface{}, err0 error){
+func DrawPolygonOnImage(img protomsg.Image)(maps map[string]interface{}, err0 error){
// draw the rook
- //rook := gocv.NewMatWithSize(w, w, gocv.MatTypeCV8UC3)
- //imgs := gocv.NewMat()
//ddd, err := RetrieveROM("/home/user/workspace/ruleprocess/util/105.jpg")
//if err != nil {
// fmt.Println("瑙ｇ爜鏈夎",err)
//}
//bbb := bytes.NewBuffer(ddd) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
- //rook, _ := gocv.NewMatFromBytes(500, 500, gocv.MatTypeCV8UC3, gocv.IMRead())
- rook := gocv.IMRead("/home/user/workspace/ruleprocess/util/105.jpg",gocv.IMReadColor)
+ //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}
@@ -181,10 +181,10 @@
// },
//}
//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)
+ gocv.Line(&rook, image.Pt(100, 100), image.Pt(100, 800), green, 2)
+ gocv.Line(&rook, image.Pt(100, 800), image.Pt(800, 800), green, 2)
+ gocv.Line(&rook, image.Pt(800, 800), image.Pt(800, 100), green, 2)
+ gocv.Line(&rook, image.Pt(800, 100), image.Pt(100, 100), green, 2)
//return nil,nil
// 涓婁紶
--
Gitblit v1.8.0