From 086ec74e94654e92b3a1c6f42612d12ef33ff4b2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 28 十月 2022 14:41:08 +0800
Subject: [PATCH] '优化自启动机制'

---
 ConsoleApplication/CurrentPriceCapture.cpp |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ConsoleApplication/CurrentPriceCapture.cpp b/ConsoleApplication/CurrentPriceCapture.cpp
index 05bca16..6cc9143 100644
--- a/ConsoleApplication/CurrentPriceCapture.cpp
+++ b/ConsoleApplication/CurrentPriceCapture.cpp
@@ -117,16 +117,23 @@
 	uchar* imgData = (uchar*)malloc(sizeof(uchar) * oimg.rows * oimg.cols);
 	if (oimg.channels() == 3)
 	{
-		openCLExcuter->rgb2Gray(oimg.data, oimg.cols, oimg.rows, imgData);
+		openCLExcuter->rgb2Gray(oimg, imgData);
 	}
 	else {
-		openCLExcuter->rgba2Gray(oimg.data, oimg.cols, oimg.rows, imgData);
+		openCLExcuter->rgba2Gray(oimg, imgData);
 	}
 	grayImg.data = imgData;
 
 
 
-	list<int*> rowData = THSActionUtil::splitPlateRowArea(grayImg);
+	list<int*> rowData;
+	try {
+		rowData = THSActionUtil::splitPlateRowArea(grayImg);
+	}
+	catch (string st) {
+		free(imgData);
+		throw st;
+	}
 
 	//每行的元素个数
 	int ele_count_per_line = 3;
@@ -149,7 +156,7 @@
 
 	int line_number_count = ele_count_per_line * length_per_num;
 
-	openCLExcuter->splitPlateContentRowData(grayImg.data, grayImg.cols, grayImg.rows, rowIndex, rowData.size(), ele_count_per_line,1,4,splitResult);
+	openCLExcuter->splitPlateContentRowData(grayImg.data, grayImg.cols, grayImg.rows, rowIndex, rowData.size(), ele_count_per_line,1,3,splitResult);
 
 	/*
 	*测试
@@ -317,7 +324,7 @@
 			int x = wrect.right - 50;
 			int y = wrect.top + 50;
 			PostMessage(win, WM_MOUSEWHEEL, 0, MAKEWORD(x, y));
-			Sleep(150);
+			Sleep(1000);
 			cv::Mat oimg = CaptureUtil::capture(win);
 			list<CurrentPriceData> codes = capture(oimg,openCLExcuter);
 			for (list<CurrentPriceData>::iterator ele = codes.begin();ele != codes.end();ele++) {

--
Gitblit v1.8.0