From c108e5ba42168841311b74034d89c31556d628c4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 七月 2022 17:24:10 +0800
Subject: [PATCH] '完善'

---
 ConsoleApplication/L2DataCapture.cpp |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ConsoleApplication/ScreenDataCapture.cpp b/ConsoleApplication/L2DataCapture.cpp
similarity index 90%
rename from ConsoleApplication/ScreenDataCapture.cpp
rename to ConsoleApplication/L2DataCapture.cpp
index c8e8fd4..55454eb 100644
--- a/ConsoleApplication/ScreenDataCapture.cpp
+++ b/ConsoleApplication/L2DataCapture.cpp
@@ -1,23 +1,23 @@
-#include "ScreenDataCapture.h"
+#include "L2DataCapture.h"
 #include <thread>
 #include<fstream>
 #include "THSActionUtil.h"
 #include <thread>
-bool ScreenDataCapture::inited;
- OpenCLExcuter* ScreenDataCapture::openCLExcuter[THS_FRAME_COUNT];
+bool L2DataCapture::inited;
+ OpenCLExcuter* L2DataCapture::openCLExcuter[THS_FRAME_COUNT];
 //是否正在执行
- bool ScreenDataCapture::running;
- bool ScreenDataCapture::runnings[THS_FRAME_COUNT];
- clock_t ScreenDataCapture::latest_running_times[THS_FRAME_COUNT];
+ bool L2DataCapture::running;
+ bool L2DataCapture::runnings[THS_FRAME_COUNT];
+ clock_t L2DataCapture::latest_running_times[THS_FRAME_COUNT];
 
- CallbackFun ScreenDataCapture::data_callback;
+ CallbackFun L2DataCapture::data_callback;
 
- string ScreenDataCapture::gpCodes[THS_FRAME_COUNT];
+ string L2DataCapture::gpCodes[THS_FRAME_COUNT];
 
- void* ScreenDataCapture::context;
+ void* L2DataCapture::context;
 
 //运行
-void ScreenDataCapture::_run(int index)
+void L2DataCapture::_run(int index)
 {
 	while (true) {
 		if (running && runnings[index]&& gpCodes[index].length()>0) {
@@ -36,7 +36,7 @@
 	}
 }
 
-void ScreenDataCapture::setGPCode(int index, string code) {
+void L2DataCapture::setGPCode(int index, string code) {
 	int length = sizeof(gpCodes) / sizeof(gpCodes[0]);
 	if (length <= index) {
 		return;
@@ -45,16 +45,16 @@
 	gpCodes[index] = code;
 }
 
-string ScreenDataCapture::getGPCode(int index) {
+string L2DataCapture::getGPCode(int index) {
     return	gpCodes[index];
 }
 
 static string getGPCode(int index);
 
-ScreenDataCapture::ScreenDataCapture() {
+L2DataCapture::L2DataCapture() {
 
 }
-void ScreenDataCapture::refreshHWND() {
+void L2DataCapture::refreshHWND() {
 	HWND win = THSActionUtil::getL2Win();
 	if (win <= 0) {
 		throw string("未获取到同花顺LEVEL2盘口");
@@ -62,7 +62,7 @@
 	CaptureUtil::init(win);
 }
 
-void ScreenDataCapture::init(CallbackFun callback, void* contex) {
+void L2DataCapture::init(CallbackFun callback, void* contex) {
 	inited = true;
 	data_callback = callback;
 	context = contex;
@@ -84,51 +84,51 @@
 	int length = sizeof(runnings) / sizeof(runnings[0]);
 	for (int i = 0;i < length;i++) {
 		runnings[i] = false;
-		thread rt(&(ScreenDataCapture::_run),i);
+		thread rt(&(L2DataCapture::_run),i);
 		rt.detach();
 	}
 
 }
 
-bool ScreenDataCapture::isRunning() {
+bool L2DataCapture::isRunning() {
 	return running;
 }
 
-void ScreenDataCapture::start(int index) {
+void L2DataCapture::start(int index) {
 	runnings[index] = true;
 }
 //结束
-void ScreenDataCapture::stop(int index) {
+void L2DataCapture::stop(int index) {
 	runnings[index] = false;
 }
 //全部开始
-void ScreenDataCapture::start() {
+void L2DataCapture::start() {
 	running = true;
 }
 //全部结束
-void ScreenDataCapture::stop() {
+void L2DataCapture::stop() {
 	running = false;
 }
 
-void ScreenDataCapture::startAll() {
+void L2DataCapture::startAll() {
 	int length = sizeof(runnings) / sizeof(runnings[0]);
 	for (int i = 0;i < length;i++) {
 		runnings[i] = true;
 	}
 }
 
-void ScreenDataCapture::stopAll() {
+void L2DataCapture::stopAll() {
 	int length = sizeof(runnings) / sizeof(runnings[0]);
 	for (int i = 0;i < length;i++) {
 		runnings[i] = false;
 	}
 }
 
-bool ScreenDataCapture::isInited() {
+bool L2DataCapture::isInited() {
 	return inited;
 }
 
-list<TradeData>  ScreenDataCapture::captureLevel2TradeData(cv::Mat oimg, int identify) {
+list<TradeData>  L2DataCapture::captureLevel2TradeData(cv::Mat oimg, int identify) {
 	if (oimg.rows == 0 || oimg.cols == 0) {
 		throw ERROR_CODE_CAPTURE_FAIL;
 	}
@@ -311,9 +311,9 @@
 	std::cout << "数据准备-0数据准备: threadid-" << std::this_thread::get_id() << " 耗时：" << time_33 - time_32 << endl;
 
 	openCLExcuter[identify]->splitL2Num(imgData, img.cols, img.rows, pos, 4 * rowDataList.size(), zeroData, _NUMBER_L2_WIDTH, _NUMBER_L2_HEIGHT, _NUMBER_L2_TOTAL_NUMBER, totalNumberData);
-
-	free(pos);
 	free(zeroData);
+	free(pos);
+	
 
 
 	/*
@@ -476,7 +476,7 @@
 }
 
 //捕获level2的盘口数据
-list<TradeData> ScreenDataCapture::captureLevel2TradeData(HWND hwnd, int index) throw(int) {
+list<TradeData> L2DataCapture::captureLevel2TradeData(HWND hwnd, int index) throw(int) {
 	cv::Mat img = CaptureUtil::capture(hwnd);
 
 	/*

--
Gitblit v1.8.0