From ffd71d97fc9eb5236e6a92db408745ddf080217b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 06 五月 2019 13:28:05 +0800
Subject: [PATCH] 整理代码

---
 analysis/demo/winYolo.go |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/analysis/demo/simpleIPC.go b/analysis/demo/winYolo.go
similarity index 87%
rename from analysis/demo/simpleIPC.go
rename to analysis/demo/winYolo.go
index 1cecdfc..befe3e6 100644
--- a/analysis/demo/simpleIPC.go
+++ b/analysis/demo/winYolo.go
@@ -11,23 +11,6 @@
 	"gocv.io/x/gocv"
 )
 
-// RunYoloFromIPC recv data from ipc
-func RunYoloFromIPC(ipcURL string, asServer bool) {
-	imageChan := make(chan srv.ImageInfo)
-
-	d := srv.NewReciever(ipcURL, imageChan)
-	go d.Run(asServer)
-
-	cfg := "./data/yolo/cfg/yolov3.cfg"
-	weights := "./data/yolo/yolov3.weights"
-	name := "./data/yolo/data/coco.names"
-
-	yolo := gosdk.InitYolo(cfg, weights, name, 0)
-
-	handleImage(yolo, imageChan)
-
-}
-
 func min(x, y int) int {
 	if x > y {
 		return y
@@ -74,7 +57,15 @@
 var startYolo bool
 var m sync.Mutex
 
-func handleImage(yolo *gosdk.YoloHandle, ch <-chan srv.ImageInfo) {
+// ShowYolo show yolo result
+func ShowYolo(ch <-chan srv.ImageInfo) {
+
+	cfg := "./data/yolo/cfg/yolov3.cfg"
+	weights := "./data/yolo/yolov3.weights"
+	name := "./data/yolo/data/coco.names"
+
+	yolo := gosdk.InitYolo(cfg, weights, name, 0)
+
 	window := gocv.NewWindow("Yolo")
 
 	pic := gocv.NewMat()

--
Gitblit v1.8.0