From e0c8467e92164100a9914e3fdcf35614b2b9bc51 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 07 十一月 2019 20:09:40 +0800
Subject: [PATCH] Merge branch 'module' of http://192.168.5.5:10010/r/ruleprocess into module
---
labelFilter/req.go | 2 --
util/simpleCV.go | 23 -----------------------
2 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index b04a123..2e6b994 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,13 +4,11 @@
"basic.com/dbapi.git"
"basic.com/valib/logger.git"
"fmt"
- "github.com/golang/protobuf/proto"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/rep"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/ipc"
"nanomsg.org/go-mangos/transport/tcp"
- "ruleprocess/structure"
"time"
)
diff --git a/util/simpleCV.go b/util/simpleCV.go
index d32691f..a3fb8f6 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -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闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
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闆嗗悎骞舵牴鎹甶d鏌ヨ鍖哄煙鐒跺悗鐢绘
- 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
}
}
}
--
Gitblit v1.8.0