From ae66a5e07a2ebb455e83c65ded12697fd0fece98 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 08 七月 2022 18:43:49 +0800
Subject: [PATCH] 'bug修复'
---
app/appDlg.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/appDlg.cpp b/app/appDlg.cpp
index 924a5a2..13d3157 100644
--- a/app/appDlg.cpp
+++ b/app/appDlg.cpp
@@ -61,6 +61,8 @@
// CappDlg 瀵硅瘽妗�
+RecognitionManager* CappDlg::recognitionManager;
+
CappDlg::CappDlg(CWnd* pParent /*=nullptr*/)
: CDialogEx(IDD_APP_DIALOG, pParent)
{
@@ -70,6 +72,7 @@
RecognitionUtil::init();
ImgUtil::init();
capture = new ScreenDataCapture();
+ recognitionManager = new RecognitionManager();
}
void CappDlg::DoDataExchange(CDataExchange* pDX)
@@ -248,13 +251,13 @@
//鏆傚仠閲囬泦
app->capture->stop(index);
- bool result = THSActionUtil::setGP(quickCode, codeList);
+ bool result = THSActionUtil::setGP(quickCode, codeList, recognitionManager);
if (!result) {
throw string("璁剧疆鐗堝潡鐩戞帶鐨凣P澶辫触");
}
- THSActionUtil::setListenL2GP(index, code);
- map<int, string> results = THSActionUtil::getListenL2GPCodes();
+ THSActionUtil::setListenL2GP(index, code, recognitionManager);
+ map<int, string> results = THSActionUtil::getListenL2GPCodes(recognitionManager);
//璁剧疆浠ｇ爜
for (map<int, string>::iterator ele = results.begin();ele != results.end();ele++) {
int key = (*ele).first;
@@ -454,7 +457,7 @@
if (!capture->isRunning()) {
try {
- map<int, string> result = THSActionUtil::getListenL2GPCodes();
+ map<int, string> result = THSActionUtil::getListenL2GPCodes(recognitionManager);
//璁剧疆浠ｇ爜
for (map<int, string>::iterator ele = result.begin();ele != result.end();ele++) {
int key= (*ele).first;
@@ -505,7 +508,7 @@
for (list<CString>::iterator ele = paths.begin();ele != paths.end();ele++) {
CString path = *ele;
std:string p = cstring2String(path);
- std::list<string> resultList = THSActionUtil::recognitionGPCode(cv::imread(p));
+ std::list<string> resultList = THSActionUtil::recognitionGPCode(cv::imread(p), recognitionManager);
for (std::list<string>::iterator ele1 = resultList.begin();ele1 != resultList.end();ele1++) {
bool contains = false;
for (std::list<string>::iterator e = fResultList.begin();e != fResultList.end();e++) {
@@ -546,7 +549,7 @@
for (list<CString>::iterator ele = paths.begin();ele != paths.end();ele++) {
CString path = *ele;
std:string p = cstring2String(path);
- std::list<string> resultList = THSActionUtil::recognitionGPCode(cv::imread(p));
+ std::list<string> resultList = THSActionUtil::recognitionGPCode(cv::imread(p), recognitionManager);
for (std::list<string>::iterator ele1 = resultList.begin();ele1 != resultList.end();ele1++) {
bool contains = false;
for (std::list<string>::iterator e = fResultList.begin();e != fResultList.end();e++) {
--
Gitblit v1.8.0