From ae66a5e07a2ebb455e83c65ded12697fd0fece98 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 08 七月 2022 18:43:49 +0800
Subject: [PATCH] 'bug修复'

---
 ConsoleApplication/THSActionUtil.h |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ConsoleApplication/THSActionUtil.h b/ConsoleApplication/THSActionUtil.h
index fe35637..85e8f47 100644
--- a/ConsoleApplication/THSActionUtil.h
+++ b/ConsoleApplication/THSActionUtil.h
@@ -29,9 +29,8 @@
 class THSActionUtil
 {
 private:
-	static RecognitionManager *recognitionManager;
 	static void addGP(string code);
-	static std::list<GPCodeArea> getListenL2GP();
+	static std::list<GPCodeArea> getListenL2GPAreaAndCode(RecognitionManager* recognitionManager);
 
 public:
 
@@ -43,22 +42,25 @@
 	//打开同花顺的副屏幕
 	static void openSecondScreen();
 	//设置股票
-	static bool setGP(std::string quickCode, list<std::string> codeList);
+	static bool setGP(std::string quickCode, list<std::string> codeList,RecognitionManager* recognitionManager);
 	//识别股票代码
 	static std::list<GPCodeArea>  recognitionGPArea(cv::Mat img);
 
 	//识别数字
-	static std::list<GPCodeArea>  recognitionNum(cv::Mat img,std::list<GPCodeArea> areaList);
+	static std::list<GPCodeArea>  recognitionGPCodeNum(cv::Mat img,std::list<GPCodeArea> areaList, RecognitionManager* recognitionManager);
 
 	//识别代码
-	static std::list<string> recognitionGPCode(cv::Mat img);
+	static std::list<string> recognitionGPCode(cv::Mat img, RecognitionManager* recognitionManager);
 
 
 	//设置获取level2的股票数据
-	static bool setListenL2GP(int p,string code);
+	static bool setListenL2GP(int p,string code, RecognitionManager* recognitionManager);
 
 	//设置获取level2的股票代码
-	static std::map<int, string> getListenL2GPCodes();
+	static std::map<int, string> getListenL2GPCodes(RecognitionManager* recognitionManager);
+
+	//识别板块内容区域
+	static GPCodeArea recognitionPlateContentArea(cv::Mat grayImg);
 
 
 

--
Gitblit v1.8.0