From 8c68d557eb4f201c16dd856ca752d23dff5d2459 Mon Sep 17 00:00:00 2001
From: RCi <15089880081@163.com>
Date: Tue, 21 May 2024 23:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HanddleAI/HandleAiUi-new/CMakeLists.txt       |   4 +-
 .../HandleAiUi-new/back/algorithmThread.cpp   |   4 +-
 .../HandleAiUi-new/back/algorithmThread.h     |  10 ++---
 .../HandleAiUi-new/back/backEndController.cpp |  26 ------------
 .../HandleAiUi-new/back/backEndManager.cpp    |  26 ++++++++++++
 .../{backEndController.h => backEndManager.h} |  18 ++++-----
 ...cameraController.cpp => cameraManager.cpp} |  38 +++++++++---------
 .../{cameraController.h => cameraManager.h}   |  20 ++++-----
 HanddleAI/HandleAiUi-new/back/camera_thread.h |   2 +-
 .../back/imgSaveThreadController.cpp          |  12 ------
 .../back/imgSaveThreadManager.cpp             |  12 ++++++
 ...eadController.h => imgSaveThreadManager.h} |  12 +++---
 HanddleAI/HandleAiUi-new/back/myiothread.cpp  |  12 +++---
 HanddleAI/HandleAiUi-new/back/myiothread.h    |   2 +-
 ...olController.cpp => threadPoolManager.cpp} |   6 +--
 ...adPoolController.h => threadPoolManager.h} |  20 ++++-----
 ...iggerController.cpp => triggerManager.cpp} |  18 ++++-----
 .../{triggerController.h => triggerManager.h} |  14 +++----
 .../front/pages/displayPageWidget.h           |  14 +++----
 HanddleAI/HandleAiUi-new/main.cpp             |   8 ++--
 HanddleAI/HandleAiUi-new/mainwindow.h         |   2 +-
 .../sqlBase.h                                 |   0
 .../sqlManager.cpp}                           |  22 +++++-----
 .../sqlManager.h}                             |   4 +-
 .../sqlStruct.h                               |   0
 .../sqliteModule.cpp                          |   2 +-
 .../sqliteModule.h                            |   0
 .../uiModule/uiModule_dumpToExcel.h           |  10 ++---
 .../uiModule/uiModule_imageView.h             |   8 ++--
 ...roller.h => uiModule_summaryDataManager.h} |   4 +-
 HanddleAI/sqliteReader/sqlControler.cpp       |  18 ++++-----
 HanddleAI/sqliteReader/sqlControler.h         |   2 +-
 HanddleAI/sqliteReader/sqliteReader.cpp       |  10 ++---
 HanddleAI/sqliteReader/sqliteReader.h         |   2 +-
 lib/Hd_3DCameraLMI_module_PointLazer.exp      | Bin 772 -> 784 bytes
 lib/Hd_3DCameraLMI_module_PointLazer.lib      | Bin 2276 -> 2276 bytes
 lib/Hd_DalsaCamera_module.exp                 | Bin 751 -> 763 bytes
 lib/Hd_DalsaCamera_module.lib                 | Bin 2120 -> 2120 bytes
 lib/Hd_FinsTcp_module.exp                     | Bin 743 -> 755 bytes
 lib/Hd_FinsTcp_module.lib                     | Bin 2064 -> 2064 bytes
 lib/Hd_MvCamera_module_GENTL.exp              | Bin 756 -> 768 bytes
 lib/Hd_MvCamera_module_GENTL.lib              | Bin 2164 -> 2164 bytes
 lib/Hd_MvCamera_module_GIGE.exp               | Bin 755 -> 767 bytes
 lib/Hd_MvCamera_module_GIGE.lib               | Bin 2148 -> 2148 bytes
 lib/Hd_ResultsSummary_module.exp              | Bin 756 -> 768 bytes
 lib/Hd_ResultsSummary_module.lib              | Bin 2164 -> 2164 bytes
 lib/Hd_SocketModule_ModbusTcp.exp             | Bin 1501 -> 1513 bytes
 lib/Hd_SocketModule_ModbusTcp.lib             | Bin 3446 -> 3446 bytes
 lib/Hd_VirtualCamera_ReadFile.exp             | Bin 759 -> 771 bytes
 lib/Hd_VirtualCamera_ReadFile.lib             | Bin 2176 -> 2176 bytes
 50 files changed, 182 insertions(+), 180 deletions(-)
 delete mode 100644 HanddleAI/HandleAiUi-new/back/backEndController.cpp
 create mode 100644 HanddleAI/HandleAiUi-new/back/backEndManager.cpp
 rename HanddleAI/HandleAiUi-new/back/{backEndController.h => backEndManager.h} (53%)
 rename HanddleAI/HandleAiUi-new/back/{cameraController.cpp => cameraManager.cpp} (86%)
 rename HanddleAI/HandleAiUi-new/back/{cameraController.h => cameraManager.h} (86%)
 delete mode 100644 HanddleAI/HandleAiUi-new/back/imgSaveThreadController.cpp
 create mode 100644 HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.cpp
 rename HanddleAI/HandleAiUi-new/back/{imgSaveThreadController.h => imgSaveThreadManager.h} (91%)
 rename HanddleAI/HandleAiUi-new/back/{threadPoolController.cpp => threadPoolManager.cpp} (98%)
 rename HanddleAI/HandleAiUi-new/back/{threadPoolController.h => threadPoolManager.h} (96%)
 rename HanddleAI/HandleAiUi-new/back/{triggerController.cpp => triggerManager.cpp} (90%)
 rename HanddleAI/HandleAiUi-new/back/{triggerController.h => triggerManager.h} (95%)
 rename HanddleAI/HandleAiUi-new/{sqliteController => sqliteManager}/sqlBase.h (100%)
 rename HanddleAI/HandleAiUi-new/{sqliteController/sqlControler.cpp => sqliteManager/sqlManager.cpp} (94%)
 rename HanddleAI/HandleAiUi-new/{sqliteController/sqlControler.h => sqliteManager/sqlManager.h} (94%)
 rename HanddleAI/HandleAiUi-new/{sqliteController => sqliteManager}/sqlStruct.h (100%)
 rename HanddleAI/HandleAiUi-new/{sqliteController => sqliteManager}/sqliteModule.cpp (99%)
 rename HanddleAI/HandleAiUi-new/{sqliteController => sqliteManager}/sqliteModule.h (100%)
 rename HanddleAI/HandleAiUi-new/uiModule/{uiModule_summaryDataController.h => uiModule_summaryDataManager.h} (99%)

diff --git a/HanddleAI/HandleAiUi-new/CMakeLists.txt b/HanddleAI/HandleAiUi-new/CMakeLists.txt
index 50ac2140..ee908f43 100644
--- a/HanddleAI/HandleAiUi-new/CMakeLists.txt
+++ b/HanddleAI/HandleAiUi-new/CMakeLists.txt
@@ -47,8 +47,8 @@ FILE(GLOB BACK_HEAD_FILES "./back/*.h" )
 FILE(GLOB BACK_SRC_FILES "./back/*.cpp")
 FILE(GLOB FRONT_HEAD_FILES "./front/*.h" )
 FILE(GLOB FRONT_SRC_FILES "./front/*.cpp")
-FILE(GLOB SQL_HEAD_FILES "./sqliteController/*.h" )
-FILE(GLOB SQL_SRC_FILES "./sqliteController/*.cpp")
+FILE(GLOB SQL_HEAD_FILES "./sqliteManager/*.h" )
+FILE(GLOB SQL_SRC_FILES "./sqliteManager/*.cpp")
 FILE(GLOB TCP_HEAD_FILES "./TCP/*.h" )
 FILE(GLOB TCP_SRC_FILES "./TCP/*.cpp")
 FILE(GLOB HEAD_FILES "./*.h" )
diff --git a/HanddleAI/HandleAiUi-new/back/algorithmThread.cpp b/HanddleAI/HandleAiUi-new/back/algorithmThread.cpp
index f912063c..8e7fc3a0 100644
--- a/HanddleAI/HandleAiUi-new/back/algorithmThread.cpp
+++ b/HanddleAI/HandleAiUi-new/back/algorithmThread.cpp
@@ -569,8 +569,8 @@ void algoThread::run()
 				std::vector<QString>strVec({ QString::fromStdString(data->SNcode),QString::number(data->camera1Width) + "x" + QString::number(data->camera1Height) });
 				bridge.front.tableViewPtr->addRowDataValue(strVec);//将数据插入界面表格
 
-				detDataController* dController = data->dController;
-				data->dController->deleteDetData(data->timeCode);
+				detDataManager* dManager = data->dManager;
+				data->dManager->deleteDetData(data->timeCode);
 			}
 		}
 		QThread::msleep(10);
diff --git a/HanddleAI/HandleAiUi-new/back/algorithmThread.h b/HanddleAI/HandleAiUi-new/back/algorithmThread.h
index ec13055c..f7656f2f 100644
--- a/HanddleAI/HandleAiUi-new/back/algorithmThread.h
+++ b/HanddleAI/HandleAiUi-new/back/algorithmThread.h
@@ -9,9 +9,9 @@
 #include <opencv.hpp>
 #include <string>
 #include <handleai.h>
-#include <sqliteController/sqlControler.h>
+#include <sqliteManager/sqlManager.h>
 #include <QtConcurrent/qtconcurrent>.
-#include <threadPoolController.h>
+#include <threadPoolManager.h>
 #include <omp.h>
 #include <algorithm>
 using namespace std;
@@ -713,8 +713,8 @@ public:
     QString threadName;
 
     handleAiModel* modelPtr;
-    sqlController* sql;
-    threadConroller* tController;
+    sqlManager* sql;
+    threadConroller* tManager;
     sncodeCls* snDatas;
 
     QMutex detQueueMutex;
@@ -730,7 +730,7 @@ public:
     bool waitForImg(detData* data,int);
     void getAllFiles(std::string path, std::vector<std::string>& files, std::string format);
     void Init(threadConroller* threadConroller) {
-        tController = threadConroller;
+        tManager = threadConroller;
         modelPtr = &threadConroller->models;
         sql = threadConroller->sql;
         snDatas = &threadConroller->snDatas;
diff --git a/HanddleAI/HandleAiUi-new/back/backEndController.cpp b/HanddleAI/HandleAiUi-new/back/backEndController.cpp
deleted file mode 100644
index a9709bba..00000000
--- a/HanddleAI/HandleAiUi-new/back/backEndController.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <backEndController.h>
-#include <triggerController.h>
-#include <cameraController.h>
-#include <jsonParsing.h>
-#include <future>
-backEndController::backEndController()
-{
-	_jsonConfiguration = new jsonConfiguration();
-	_triggerController = new triggerController();
-	_cameraController = new cameraController();
-	_threadConroller = new threadConroller();
-	std::vector<std::future<void>> futures;//�첽��ʼ��
-	futures.push_back(std::async(std::launch::async, &triggerController::init, _triggerController, this));
-	futures.push_back(std::async(std::launch::async, &cameraController::init, _cameraController, this));
-	for (auto& future : futures) {
-		future.wait();
-	}
-	/*_triggerController->init(this);
-	_cameraController->init(this);*/
-}
-backEndController::~backEndController()
-{
-	delete _triggerController;
-	delete _cameraController;
-	delete _jsonConfiguration;
-}
\ No newline at end of file
diff --git a/HanddleAI/HandleAiUi-new/back/backEndManager.cpp b/HanddleAI/HandleAiUi-new/back/backEndManager.cpp
new file mode 100644
index 00000000..bc8a3873
--- /dev/null
+++ b/HanddleAI/HandleAiUi-new/back/backEndManager.cpp
@@ -0,0 +1,26 @@
+#include <backEndManager.h>
+#include <triggerManager.h>
+#include <cameraManager.h>
+#include <jsonParsing.h>
+#include <future>
+backEndManager::backEndManager()
+{
+	_jsonConfiguration = new jsonConfiguration();
+	_triggerManager = new triggerManager();
+	_cameraManager = new cameraManager();
+	_threadConroller = new threadConroller();
+	std::vector<std::future<void>> futures;//�첽��ʼ��
+	futures.push_back(std::async(std::launch::async, &triggerManager::init, _triggerManager, this));
+	futures.push_back(std::async(std::launch::async, &cameraManager::init, _cameraManager, this));
+	for (auto& future : futures) {
+		future.wait();
+	}
+	/*_triggerManager->init(this);
+	_cameraManager->init(this);*/
+}
+backEndManager::~backEndManager()
+{
+	delete _triggerManager;
+	delete _cameraManager;
+	delete _jsonConfiguration;
+}
\ No newline at end of file
diff --git a/HanddleAI/HandleAiUi-new/back/backEndController.h b/HanddleAI/HandleAiUi-new/back/backEndManager.h
similarity index 53%
rename from HanddleAI/HandleAiUi-new/back/backEndController.h
rename to HanddleAI/HandleAiUi-new/back/backEndManager.h
index dc7ed763..1d62be3a 100644
--- a/HanddleAI/HandleAiUi-new/back/backEndController.h
+++ b/HanddleAI/HandleAiUi-new/back/backEndManager.h
@@ -1,23 +1,23 @@
-#ifndef BACKENDCONTROLLER_H
-#define BACKENDCONTROLLER_H
+#ifndef BACKENDManager_H
+#define BACKENDManager_H
 #include <qobject.h>
 #include <globalStruct.h>
-class triggerController;
-class cameraController;
+class triggerManager;
+class cameraManager;
 class jsonConfiguration;
 class threadConroller;
-class backEndController :public QObject
+class backEndManager :public QObject
 {
 	Q_OBJECT
 public:
 	bool init = false;
 	jsonConfiguration* _jsonConfiguration;
 
-	triggerController* _triggerController;//������
-	cameraController* _cameraController;
+	triggerManager* _triggerManager;//������
+	cameraManager* _cameraManager;
 	threadConroller* _threadConroller;
-	backEndController();
-	~backEndController();
+	backEndManager();
+	~backEndManager();
 signals:
 	void sendErrorToMainwindow(backEndError);
 	void sendPixmapImageWidget(showImgPack*);
diff --git a/HanddleAI/HandleAiUi-new/back/cameraController.cpp b/HanddleAI/HandleAiUi-new/back/cameraManager.cpp
similarity index 86%
rename from HanddleAI/HandleAiUi-new/back/cameraController.cpp
rename to HanddleAI/HandleAiUi-new/back/cameraManager.cpp
index 166c769b..51950d52 100644
--- a/HanddleAI/HandleAiUi-new/back/cameraController.cpp
+++ b/HanddleAI/HandleAiUi-new/back/cameraManager.cpp
@@ -1,5 +1,5 @@
-#include <cameraController.h>
-#include <backEndController.h>
+#include <cameraManager.h>
+#include <backEndManager.h>
 #include <jsonParsing.h>
 #include <qlibrary.h>
 #include <windows.h>
@@ -29,7 +29,7 @@ static MV_CC_DEVICE_INFO_LIST searchMvDevice()
 	return m_stDevList;
 }
 
-camera::camera(cameraModule cameraModulePtrIn, backEndController* backEndControllerIn, int indexIn)
+camera::camera(cameraModule cameraModulePtrIn, backEndManager* backEndManagerIn, int indexIn)
 {
 	cameraModulePtr = cameraModulePtrIn;
 	cameraName = cameraModulePtr.key;
@@ -81,23 +81,25 @@ void camera::run()
 		}
 		if (data != nullptr)
 		{
-			data->mutex->lock();
-			int imgCnt = data->imgAmountMin;
-			getCameraImg(camera_mat);
-			while (camera_mat.size() > 0)
+			data->imgMutex->lock();
+			while(1)
 			{
-				for (auto img : camera_mat)
+				getCameraImg(data->imgs);
+				if (data->imgs.size() > data->imgAmountMin)
 				{
-
+					qDebug() << data->timeCode << " Min:" << data->imgAmountMin << " Get:" << data->imgs.size();
+					data->imgMutex->unlock();
+					data = nullptr;
+					break;
 				}
 			}
-			data->mutex->unlock();
+			data->imgMutex->unlock();
 		}
 		QThread::msleep(100);
 	}
 }
 
-cameraController::~cameraController()
+cameraManager::~cameraManager()
 {
 	for (auto camera : cameras)
 	{
@@ -109,9 +111,9 @@ cameraController::~cameraController()
 		delete base_ptr;
 	}
 }
-void cameraController::init(backEndController* input)
+void cameraManager::init(backEndManager* input)
 {
-	_backEndController = input;
+	_backEndManager = input;
 #pragma region �������dll
 	for (auto val = 0; val < input->_jsonConfiguration->camera.cameraList.size(); val++)
 	{
@@ -160,8 +162,8 @@ void cameraController::init(backEndController* input)
 		
 		if (m_module.module_ptr->initParas(initByte))
 		{
-			camera* _camera = new camera(m_module,_backEndController, cameras.size());
-			QObject::connect(_camera, &camera::S1, this, &cameraController::R1);
+			camera* _camera = new camera(m_module,_backEndManager, cameras.size());
+			QObject::connect(_camera, &camera::S1, this, &cameraManager::R1);
 			cameras.insert(std::make_pair(m_module.key, _camera));
 			qDebug() << "[INFO] " << " initParas success!";
 		}
@@ -171,7 +173,7 @@ void cameraController::init(backEndController* input)
 
 	this->start();
 }
-bool cameraController::loadModule(QString keyName, QString moduleName, QByteArray initByte)
+bool cameraManager::loadModule(QString keyName, QString moduleName, QByteArray initByte)
 {
 	QString task_thread_index = 0;
 	try
@@ -233,8 +235,8 @@ bool cameraController::loadModule(QString keyName, QString moduleName, QByteArra
 	}
 	return true;
 }
-void cameraController::R1(showImgPack* pack)
+void cameraManager::R1(showImgPack* pack)
 {
 	
-	emit _backEndController->sendPixmapImageWidget(pack);
+	emit _backEndManager->sendPixmapImageWidget(pack);
 }
diff --git a/HanddleAI/HandleAiUi-new/back/cameraController.h b/HanddleAI/HandleAiUi-new/back/cameraManager.h
similarity index 86%
rename from HanddleAI/HandleAiUi-new/back/cameraController.h
rename to HanddleAI/HandleAiUi-new/back/cameraManager.h
index e000139b..2659f6eb 100644
--- a/HanddleAI/HandleAiUi-new/back/cameraController.h
+++ b/HanddleAI/HandleAiUi-new/back/cameraManager.h
@@ -1,5 +1,5 @@
-#ifndef CAMERACONTROLLER_H
-#define CAMERACONTROLLER_H
+#ifndef CAMERAManager_H
+#define CAMERAManager_H
 #include <QString>
 #include <backStruct.h>
 #include <unordered_map>
@@ -11,16 +11,16 @@
 #include <qdebug.h>
 #include <globalStruct.h>
 #include <qdatetime.h>
-#include <back/threadPoolController.h>
+#include <back/threadPoolManager.h>
 //Ӳ����Ҫ���ڴ������ǰ���������ź�
-class backEndController;
+class backEndManager;
 class camera : public QThread
 {
 	Q_OBJECT
 public:
 	QTime lastUpdateTime;
 	QString cameraName;
-	camera(cameraModule cameraModulePtrIn, backEndController* backEndControllerIn, int indexIn);
+	camera(cameraModule cameraModulePtrIn, backEndManager* backEndManagerIn, int indexIn);
 	~camera()
 	{
 		runFlag = false;
@@ -79,18 +79,18 @@ private:
 	int timeout = 5000;
 	cameraModule cameraModulePtr;
 	QQueue<cv::Mat>imgQueue;
-	backEndController* _backEndController;
+	backEndManager* _backEndManager;
 	bool runFlag = true;
 
 	int imgLost = 0;//δȡ�ôӶ���ʧ��ͼƬ����
 	int showLost = 0;//��Ϊ����ˢ�����ʵͶ�δ��ʾ������ 
 };
-class cameraController : public QThread
+class cameraManager : public QThread
 {
 	Q_OBJECT
 public:
-	void init(backEndController*);
-	~cameraController();
+	void init(backEndManager*);
+	~cameraManager();
 	std::unordered_map<QString, camera*>cameras;//key �����
 	void run()
 	{
@@ -105,7 +105,7 @@ public:
 	}
 private:
 	bool loadModule(QString keyName, QString moduleName, QByteArray initByte);
-	backEndController* _backEndController;
+	backEndManager* _backEndManager;
 
 	std::vector<cameraModule>camerasVec;//���ڳ�ʼ��������
 	std::vector<cv::Mat> vec_mat;//ûɶ�ã�һֱ����Ϊ�վͺ�
diff --git a/HanddleAI/HandleAiUi-new/back/camera_thread.h b/HanddleAI/HandleAiUi-new/back/camera_thread.h
index 6d2c46eb..419e0695 100644
--- a/HanddleAI/HandleAiUi-new/back/camera_thread.h
+++ b/HanddleAI/HandleAiUi-new/back/camera_thread.h
@@ -21,7 +21,7 @@
 #include <qmutex.h>
 #include "struct.h"
 #include <qserialport.h>
-#include <threadPoolController.h>
+#include <threadPoolManager.h>
 #pragma execution_character_set("utf-8")
 // 模块线程
 
diff --git a/HanddleAI/HandleAiUi-new/back/imgSaveThreadController.cpp b/HanddleAI/HandleAiUi-new/back/imgSaveThreadController.cpp
deleted file mode 100644
index dd777bda..00000000
--- a/HanddleAI/HandleAiUi-new/back/imgSaveThreadController.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <backEndController.h>
-#include <imgSaveThreadController.h>
-#include <jsonParsing.h>
-
-imgSaveThreadController::imgSaveThreadController(backEndController* backEndControllerIn)
-{
-	_backEndController = backEndControllerIn;
-
-	QString str = _backEndController->_jsonConfiguration->imgSavePath;
-	oriSaveThread = new imgSaveThread(oriImgSaveThread,str);
-	resSaveThread = new imgSaveThread(resImgSaveThread,str);
-}
diff --git a/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.cpp b/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.cpp
new file mode 100644
index 00000000..cd50169b
--- /dev/null
+++ b/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.cpp
@@ -0,0 +1,12 @@
+#include <backEndManager.h>
+#include <imgSaveThreadManager.h>
+#include <jsonParsing.h>
+
+imgSaveThreadManager::imgSaveThreadManager(backEndManager* backEndManagerIn)
+{
+	_backEndManager = backEndManagerIn;
+
+	QString str = _backEndManager->_jsonConfiguration->imgSavePath;
+	oriSaveThread = new imgSaveThread(oriImgSaveThread,str);
+	resSaveThread = new imgSaveThread(resImgSaveThread,str);
+}
diff --git a/HanddleAI/HandleAiUi-new/back/imgSaveThreadController.h b/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.h
similarity index 91%
rename from HanddleAI/HandleAiUi-new/back/imgSaveThreadController.h
rename to HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.h
index ea53b606..594b0bd9 100644
--- a/HanddleAI/HandleAiUi-new/back/imgSaveThreadController.h
+++ b/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.h
@@ -1,10 +1,10 @@
 #include <qthread.h>
 #include <opencv.hpp>
 #include <qqueue.h>
-#include <sqliteController/sqlControler.h>
+#include <sqliteManager/sqlManager.h>
 #include <qdatetime.h>
 #include <backStruct.h>
-class backEndController;
+class backEndManager;
 enum imgSaveThreadType
 {
 	oriImgSaveThread,
@@ -100,15 +100,15 @@ private:
 	std::string path = "";
 	std::string basicFormat = "";
 	imgSaveThreadType type;
-	sqlController* sql;
+	sqlManager* sql;
 	bool runFlag = true;
 };
-class imgSaveThreadController
+class imgSaveThreadManager
 {
 public:
-	imgSaveThreadController(backEndController* backEndControllerIn);
+	imgSaveThreadManager(backEndManager* backEndManagerIn);
 private:
-	backEndController* _backEndController;
+	backEndManager* _backEndManager;
 	imgSaveThread* oriSaveThread;
 	imgSaveThread* resSaveThread;	
 };
diff --git a/HanddleAI/HandleAiUi-new/back/myiothread.cpp b/HanddleAI/HandleAiUi-new/back/myiothread.cpp
index 49c2f7f7..182b88bd 100644
--- a/HanddleAI/HandleAiUi-new/back/myiothread.cpp
+++ b/HanddleAI/HandleAiUi-new/back/myiothread.cpp
@@ -404,7 +404,7 @@ void MyIoThread::decodeCameraCMD(QByteArray byte)
         correctionData->in_Y_Y0Z = { -1147.29,-1147.28,-940.82 };
         correctionData->in_Z_Y0Z = { 118.15,-228.19,-256.5 };
         correctionData->in_X_Y0Z_Value = { -36.652200,-36.7302,41.0436 };
-        detData* data = dController.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
+        detData* data = dManager.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
         data->correctionData = correctionData;
         workThread->addTask(data);//添加任务
         correctionData = nullptr;
@@ -479,7 +479,7 @@ void MyIoThread::decodeCameraCMD(QByteArray byte)
         //上位机校正完成，将寄存器274置为1，并将结果按照定义XYZ规则放入310~336中
         if (armPos == 9)
         {
-            detData* data = dController.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
+            detData* data = dManager.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
             data->correctionData = correctionData;
             workThread->addTask(data);//添加任务
             correctionData = nullptr;
@@ -510,9 +510,9 @@ void MyIoThread::decodeCameraCMD(QByteArray byte)
     //    bridge.back.sendFinsMsg("write_short_851_10");//开始检测信号
     //    //bridge.back.sendFinsMsg("write_short_851_100");//开始检测信号
     //    /////////数据初始化////////
-    //    //detData* data = dController.insertDetData("Camera1", "Thread1", workThread->snDatas.readSnFromQByteArray(byte, snPos, false, true, 0), 0);
+    //    //detData* data = dManager.insertDetData("Camera1", "Thread1", workThread->snDatas.readSnFromQByteArray(byte, snPos, false, true, 0), 0);
     //    lastSn = "none" + to_string(clock());
-    //    detData* data = dController.insertDetData("Camera1", "Thread1", lastSn, 0);
+    //    detData* data = dManager.insertDetData("Camera1", "Thread1", lastSn, 0);
     //    //data->imgs.push_back(cv::imread("E://SSDBackup//1-12//18H//none419774//1.bmp",-1));
     //    //data->imgs.push_back(cv::imread("E://SSDBackup//1-12//18H//none419774//2.bmp",-1));
     //    //qDebug() << "[ Station 10 ] " << QString::fromUtf8("2.5D1第一次拍照开始 timeCode:") << data->timeCode;
@@ -538,10 +538,10 @@ void MyIoThread::decodeCameraCMD(QByteArray byte)
     //    bridge.back.sendFinsMsg("write_short_851_20");//开始检测信号
     //    //bridge.back.sendFinsMsg("write_short_851_200");//开始检测信号
     //    /////////数据初始化////////
-    //    //detData* data = dController.insertDetData("Camera1", "Thread1", workThread->snDatas.readSnFromQByteArray(byte, snPos, false, true, 0), 0);
+    //    //detData* data = dManager.insertDetData("Camera1", "Thread1", workThread->snDatas.readSnFromQByteArray(byte, snPos, false, true, 0), 0);
     //    if(lastSn =="")
     //        lastSn = "none" + to_string(clock());
-    //    detData* data = dController.insertDetData("Camera1", "Thread2", lastSn, 0);
+    //    detData* data = dManager.insertDetData("Camera1", "Thread2", lastSn, 0);
     //    lastSn == "";
     //    //data->imgs.push_back(cv::imread("I://1-12//18H//none419774//1.bmp", -1));
     //    //data->imgs.push_back(cv::imread("I://1-12//18H//none419774//2.bmp", -1));
diff --git a/HanddleAI/HandleAiUi-new/back/myiothread.h b/HanddleAI/HandleAiUi-new/back/myiothread.h
index f6910e58..9ffec0b4 100644
--- a/HanddleAI/HandleAiUi-new/back/myiothread.h
+++ b/HanddleAI/HandleAiUi-new/back/myiothread.h
@@ -96,7 +96,7 @@ public:
     void setType(QString io_type) { m_IoType = io_type; }
     void writeSnFromString(string SN, int startPos, bool highLowConversion);
     void requestSummary(std::string sn, int offset);
-    detDataController dController;
+    detDataManager dManager;
     threadConroller* workThread ;
     bool barcodeScanLock = false;
 private:
diff --git a/HanddleAI/HandleAiUi-new/back/threadPoolController.cpp b/HanddleAI/HandleAiUi-new/back/threadPoolManager.cpp
similarity index 98%
rename from HanddleAI/HandleAiUi-new/back/threadPoolController.cpp
rename to HanddleAI/HandleAiUi-new/back/threadPoolManager.cpp
index 2f82beb5..64ea7b9d 100644
--- a/HanddleAI/HandleAiUi-new/back/threadPoolController.cpp
+++ b/HanddleAI/HandleAiUi-new/back/threadPoolManager.cpp
@@ -1,4 +1,4 @@
-#include <threadPoolController.h>
+#include <threadPoolManager.h>
 #include "camera_thread.h"
 #include "myiothread.h"
 #include <FrontendBackendBridge.h>
@@ -34,11 +34,11 @@ std::string getCurrentDateTime_2() {
 int threadAmount = 0;
 int maxThread = 16;
 
-////////////THREAD//CONTROLLER////////////////////////
+////////////THREAD//Manager////////////////////////
 threadConroller::threadConroller(QObject* parent) : QThread(parent)
 {
 	//sql��ʼ��
-	sql = new sqlController;
+	sql = new sqlManager;
 	sql->initPara();
 	//�����̳߳�ʼ��
 	//oriSaveThread->oriThread = true;
diff --git a/HanddleAI/HandleAiUi-new/back/threadPoolController.h b/HanddleAI/HandleAiUi-new/back/threadPoolManager.h
similarity index 96%
rename from HanddleAI/HandleAiUi-new/back/threadPoolController.h
rename to HanddleAI/HandleAiUi-new/back/threadPoolManager.h
index edfbb55f..1cbededb 100644
--- a/HanddleAI/HandleAiUi-new/back/threadPoolController.h
+++ b/HanddleAI/HandleAiUi-new/back/threadPoolManager.h
@@ -8,7 +8,7 @@
 #include <opencv.hpp>
 #include <string>
 #include <handleAiModel.h>
-#include <sqliteController/sqlControler.h>  
+#include <sqliteManager/sqlManager.h>  
 #include <QtConcurrent/qtconcurrent>
 #include <QMetaType>
 #include <fileManager.h>
@@ -19,7 +19,7 @@
 class threadConroller;
 class algoThread;
 class subThread;
-class detDataController;
+class detDataManager;
 //class detData;
 struct saveStruct
 {
@@ -85,7 +85,7 @@ class detData
 {
 public:
     const unsigned long long timeCode = getTimeCode();//����ʱ�����������ɵ�ֵ��Ψһ
-    QMutex* mutex;
+    QMutex* imgMutex;
     std::string SNcode;
    
     QString cameraKeyName;
@@ -106,7 +106,7 @@ public:
     int oriShowIndex = -1;//ԭͼ�ڵڼ�����չʾ
     int resShowIndex = -1;//���ͼ�ڵڼ�����չʾ
     std::string snErrorsnError = std::string("snErrNoSn");
-    detDataController* dController=nullptr;
+    detDataManager* dManager=nullptr;
     static unsigned long long getTimeCode() {
         auto now = std::chrono::high_resolution_clock::now();
         auto timestamp = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
@@ -147,7 +147,7 @@ public:
         algoThreadName = IN_algoThreadName;
         oriShowIndex = IN_oriShowIndex;
         SNcode = IN_SN;
-        mutex = new QMutex();
+        imgMutex = new QMutex();
     }
     ~detData()
     {
@@ -155,7 +155,7 @@ public:
             img.release();
         for (auto img : resultImgs)
             img.release();
-        delete mutex;
+        delete imgMutex;
         //delete cameraImgPtr;
     }
 
@@ -178,11 +178,11 @@ public:
             return false;
     }
 };
-class detDataController
+class detDataManager
 {
 public:
     std::unordered_map<unsigned long long, detData*>map;
-    //std::map<unsigned long long, detData*>tstMap;
+
     QLinkedList<detData> detDatas;
     QMutex dataMutex;
     detData* insertDetData(QString IN_cameraKeyName, QString IN_algoThreadName,
@@ -190,7 +190,7 @@ public:
     {
         dataMutex.lock();
         detData data(IN_cameraKeyName, IN_algoThreadName, IN_SN, IN_oriShowIndex);
-        data.dController = this;
+        data.dManager = this;
         detDatas.push_back(data);
         map.insert({ data.timeCode,&detDatas.back() });
         dataMutex.unlock();
@@ -271,7 +271,7 @@ public:
     QMutex queueMutex;
     cameraImages cameraImgs;
     QQueue<detData*> detDataQueue;
-    sqlController* sql;
+    sqlManager* sql;
     handleAiModel models;//��ʼ��ģ��
     autoDelete* autoDeleteThread;
     
diff --git a/HanddleAI/HandleAiUi-new/back/triggerController.cpp b/HanddleAI/HandleAiUi-new/back/triggerManager.cpp
similarity index 90%
rename from HanddleAI/HandleAiUi-new/back/triggerController.cpp
rename to HanddleAI/HandleAiUi-new/back/triggerManager.cpp
index 444d23f8..6943dae4 100644
--- a/HanddleAI/HandleAiUi-new/back/triggerController.cpp
+++ b/HanddleAI/HandleAiUi-new/back/triggerManager.cpp
@@ -1,7 +1,7 @@
-#include <triggerController.h>
-#include <backEndController.h>
+#include <triggerManager.h>
+#include <backEndManager.h>
 #include <backStruct.h>
-void triggerController::decodeCameraCMD(QByteArray byte)
+void triggerManager::decodeCameraCMD(QByteArray byte)
 {
 #if 0
     if (byte.isEmpty())
@@ -24,7 +24,7 @@ void triggerController::decodeCameraCMD(QByteArray byte)
         correctionData->in_Y_Y0Z = { -1147.29,-1147.28,-940.82 };
         correctionData->in_Z_Y0Z = { 118.15,-228.19,-256.5 };
         correctionData->in_X_Y0Z_Value = { -36.652200,-36.7302,41.0436 };
-        detData* data = dController.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
+        detData* data = dManager.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
         data->correctionData = correctionData;
         workThread->addTask(data);//��������
         correctionData = nullptr;
@@ -99,7 +99,7 @@ void triggerController::decodeCameraCMD(QByteArray byte)
         //��λ��У����ɣ����Ĵ���274��Ϊ1������������ն���XYZ�������310~336��
         if (armPos == 9)
         {
-            detData* data = dController.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
+            detData* data = dManager.insertDetData("Camera1", "correctionDataThread", "TEST", 0);
             data->correctionData = correctionData;
             workThread->addTask(data);//��������
             correctionData = nullptr;
@@ -119,14 +119,14 @@ void triggerController::decodeCameraCMD(QByteArray byte)
 #endif
 }
 
-void triggerController::init(backEndController* input)
+void triggerManager::init(backEndManager* input)
 {
-    _backEndController = input;
+    _backEndManager = input;
     QLibrary* m_lib = new QLibrary(triggerFileName);
     bool flag = m_lib->load();
     if (!m_lib->isLoaded())
     {
-        emit _backEndController->sendErrorToMainwindow(dllNotFound);
+        emit _backEndManager->sendErrorToMainwindow(dllNotFound);
         return;
     }
 
@@ -145,7 +145,7 @@ void triggerController::init(backEndController* input)
         }
         else
         {
-            emit _backEndController->sendErrorToMainwindow(triggerInitFailure);
+            emit _backEndManager->sendErrorToMainwindow(triggerInitFailure);
             delete m_lib;
             m_lib = nullptr;
             return;
diff --git a/HanddleAI/HandleAiUi-new/back/triggerController.h b/HanddleAI/HandleAiUi-new/back/triggerManager.h
similarity index 95%
rename from HanddleAI/HandleAiUi-new/back/triggerController.h
rename to HanddleAI/HandleAiUi-new/back/triggerManager.h
index b6c6e232..16c9fb6b 100644
--- a/HanddleAI/HandleAiUi-new/back/triggerController.h
+++ b/HanddleAI/HandleAiUi-new/back/triggerManager.h
@@ -1,12 +1,12 @@
-#ifndef TRIGGERCONTROLLER_H
-#define TRIGGERCONTROLLER_H
+#ifndef TRIGGERManager_H
+#define TRIGGERManager_H
 #include <qdebug.h>
 #include <qthread.h>
 #include <base.h>
 #include <qlibrary.h>
 #include <globalStruct.h>
 #include <backStruct.h>
-class backEndController;
+class backEndManager;
 //��ֹ�ظ�����
 class triggerLockerT
 {
@@ -55,18 +55,18 @@ private:
 
 };
 //�������� fins���� tcp������ ���myiothread
-class triggerController : public QThread
+class triggerManager : public QThread
 {
 public:
     QString triggerFileName = QString("Hd_SocketModule_ModbusTcp");
-    ~triggerController()
+    ~triggerManager()
     {
         runFlag = false;
         QThread::msleep(100);
         delete trigger;
         QThread::msleep(1000);
     }
-    void init(backEndController* input);
+    void init(backEndManager* input);
     void run()
     {
         while (runFlag)
@@ -125,7 +125,7 @@ public:
         return true;
     }
 private:
-    backEndController* _backEndController;
+    backEndManager* _backEndManager;
     triggerLockerT tLocker;//��ֹ�ظ�����,ÿ���յ�����ʱ��������Ƿ����ϴ���ͬ�������ͬcheckTrigger�᷵��false
     /// <summary>
     /// ���QByteArray��ijλ�õ�ֵ�Ƿ������һ����ʹ���˾���λ��
diff --git a/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h b/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h
index 715d972b..1c81c7fa 100644
--- a/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h
+++ b/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h
@@ -5,14 +5,14 @@
 #include <unordered_map>
 #include <uiModule/uiModule_imageView.h>
 #include <uiModule/components/fancyWidget.h>
-#include <uiModule/uiModule_summaryDataController.h>
+#include <uiModule/uiModule_summaryDataManager.h>
 class displayWidget :public QWidget
 {
 public:
 	QHBoxLayout* Layout;
 	QLabel* icon, * Title;
 	QWidget* leftWidget, * rightWidget;
-	ImageWidgetController _ImageWidgetController;
+	ImageWidgetManager _ImageWidgetManager;
 	//ImageWidget* imgWidget;
 	displayWidget()
 	{
@@ -35,7 +35,7 @@ public:
 	}
 	void rightItemInit()
 	{
-		summaryDataController* test = new summaryDataController();
+		summaryDataManager* test = new summaryDataManager();
 		QVBoxLayout* hLayout = new QVBoxLayout(rightWidget);
 		hLayout->addWidget(test->widget);
 	}
@@ -53,10 +53,10 @@ public:
 		Title->setAlignment(Qt::AlignLeft);
 		hLayout->addWidget(Title);
 
-		hLayout->addWidget(&_ImageWidgetController);
-		_ImageWidgetController.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-		_ImageWidgetController.createViewer(u8"���1");
-		_ImageWidgetController.createViewer(u8"���2");
+		hLayout->addWidget(&_ImageWidgetManager);
+		_ImageWidgetManager.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+		_ImageWidgetManager.createViewer(u8"���1");
+		_ImageWidgetManager.createViewer(u8"���2");
 	}
 	void windowChanged()
 	{
diff --git a/HanddleAI/HandleAiUi-new/main.cpp b/HanddleAI/HandleAiUi-new/main.cpp
index 07b087c3..a4174cf2 100644
--- a/HanddleAI/HandleAiUi-new/main.cpp
+++ b/HanddleAI/HandleAiUi-new/main.cpp
@@ -9,12 +9,12 @@
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qcombobox.h>
-#include <backEndController.h>
+#include <backEndManager.h>
 #include <QMetaType>
 #include <globalStruct.h>
-void connectSignalAndSlots(MainWindow* front, backEndController* back)
+void connectSignalAndSlots(MainWindow* front, backEndManager* back)
 {
-    QObject::connect(back, &backEndController::sendPixmapImageWidget, front, &MainWindow::recvPixmapImageWidget);
+    QObject::connect(back, &backEndManager::sendPixmapImageWidget, front, &MainWindow::recvPixmapImageWidget);
 }
 int main(int argc, char* argv[])
 {
@@ -35,7 +35,7 @@ int main(int argc, char* argv[])
     //////////
     qRegisterMetaType<imgWidgetShowType>("imgWidgetShowType");
     qRegisterMetaType<showImgPack>("showImgPack");
-    backEndController _backEnd;
+    backEndManager _backEnd;
     MainWindow w;
     connectSignalAndSlots(&w,&_backEnd);
     w.show();
diff --git a/HanddleAI/HandleAiUi-new/mainwindow.h b/HanddleAI/HandleAiUi-new/mainwindow.h
index 9b424424..5ebd55b8 100644
--- a/HanddleAI/HandleAiUi-new/mainwindow.h
+++ b/HanddleAI/HandleAiUi-new/mainwindow.h
@@ -122,7 +122,7 @@ public slots:
     //带数据的
     void recvPixmapImageWidget(showImgPack* pack)
     {
-        _displayWidget->_ImageWidgetController.showImg(pack->img, pack->type, pack->index);
+        _displayWidget->_ImageWidgetManager.showImg(pack->img, pack->type, pack->index);
         delete pack;
     }
 signals:
diff --git a/HanddleAI/HandleAiUi-new/sqliteController/sqlBase.h b/HanddleAI/HandleAiUi-new/sqliteManager/sqlBase.h
similarity index 100%
rename from HanddleAI/HandleAiUi-new/sqliteController/sqlBase.h
rename to HanddleAI/HandleAiUi-new/sqliteManager/sqlBase.h
diff --git a/HanddleAI/HandleAiUi-new/sqliteController/sqlControler.cpp b/HanddleAI/HandleAiUi-new/sqliteManager/sqlManager.cpp
similarity index 94%
rename from HanddleAI/HandleAiUi-new/sqliteController/sqlControler.cpp
rename to HanddleAI/HandleAiUi-new/sqliteManager/sqlManager.cpp
index e5531e82..04ddd3a1 100644
--- a/HanddleAI/HandleAiUi-new/sqliteController/sqlControler.cpp
+++ b/HanddleAI/HandleAiUi-new/sqliteManager/sqlManager.cpp
@@ -1,5 +1,5 @@
 
-#include <sqliteController/sqlControler.h>
+#include <sqliteManager/sqlManager.h>
 #include <FrontendBackendBridge.h>
 //老代码 
 std::vector<std::string> getFutureDates(int days)
@@ -55,11 +55,11 @@ std::string getPreviousDate()
 
 	return oss.str();
 }
-void sqlController::uninitlize()
+void sqlManager::uninitlize()
 {
 	sqlite3_close(db);
 }
-sqlTableDatas sqlController::selectSingleData(std::string selectStr, std::string SN)
+sqlTableDatas sqlManager::selectSingleData(std::string selectStr, std::string SN)
 {
 	sqlTableDatas selectResult;
 	dbPtr->Select(getCurrentDate(), { selectStr }, "SN", SN, selectResult);
@@ -68,7 +68,7 @@ sqlTableDatas sqlController::selectSingleData(std::string selectStr, std::string
 
 	return selectResult;
 }
-sqlTableDatas sqlController::selectAllData(std::string SN)
+sqlTableDatas sqlManager::selectAllData(std::string SN)
 {
 	//dbPtr->Update(getCurrentTableName(), { {"send","1" } }, "sn", SN);
 	sqlTableDatas selectResult;
@@ -77,7 +77,7 @@ sqlTableDatas sqlController::selectAllData(std::string SN)
 		dbPtr->Select(getPreviousDate(), {}, "SN", SN, selectResult);
 	return selectResult;
 }
-void sqlController::initPara(std::string dataBasePath, bool backup)
+void sqlManager::initPara(std::string dataBasePath, bool backup)
 {
 	std::cout << "SQL runing Init..." << std::endl;
 	dbPtr = new sqliteModule(dataBasePath);//初始化
@@ -146,7 +146,7 @@ void sqlController::initPara(std::string dataBasePath, bool backup)
 	//addData("12345", dataVec);
 
 }
-bool sqlController::addData(std::string SN,std::vector<sqlData> data)
+bool sqlManager::addData(std::string SN,std::vector<sqlData> data)
 {
 	if (SN.empty())//SN码为空，将停止处理
 	{
@@ -172,7 +172,7 @@ bool sqlController::addData(std::string SN,std::vector<sqlData> data)
 }
 
 #if 0
-void sqlController::checkCol(sqlite3* db, std::string tableName, std::string columnName)
+void sqlManager::checkCol(sqlite3* db, std::string tableName, std::string columnName)
 {
 	try
 	{
@@ -207,7 +207,7 @@ void sqlController::checkCol(sqlite3* db, std::string tableName, std::string col
 	}
 
 }
-sqlDataStruct sqlController::selectData(std::string SN, int send)
+sqlDataStruct sqlManager::selectData(std::string SN, int send)
 {
 	std::string query;
 	int rc;
@@ -245,7 +245,7 @@ sqlDataStruct sqlController::selectData(std::string SN, int send)
 	}
 	return Respone;
 }
-int sqlController::checktSn(std::string SN)
+int sqlManager::checktSn(std::string SN)
 {
 	return 0;
 	std::string query = "SELECT COUNT(*) FROM \'" + getCurrentTableName() + "\' WHERE sn LIKE '" + SN + "%'; ";
@@ -282,7 +282,7 @@ int sqlController::checktSn(std::string SN)
 	sqlite3_finalize(statement);
 	return num;
 }
-bool sqlController::addData(sqlDataStruct data)
+bool sqlManager::addData(sqlDataStruct data)
 {
 	if (data.SN.empty())//SN码为空，将停止处理
 	{
@@ -365,7 +365,7 @@ bool sqlController::addData(sqlDataStruct data)
 }
 #endif
 #if 0
-sqlDataStruct sqlController::selectData(std::string SN, int snCountIndex, int send)
+sqlDataStruct sqlManager::selectData(std::string SN, int snCountIndex, int send)
 {
 	std::string query;
 	int rc;
diff --git a/HanddleAI/HandleAiUi-new/sqliteController/sqlControler.h b/HanddleAI/HandleAiUi-new/sqliteManager/sqlManager.h
similarity index 94%
rename from HanddleAI/HandleAiUi-new/sqliteController/sqlControler.h
rename to HanddleAI/HandleAiUi-new/sqliteManager/sqlManager.h
index 810156ac..f8f202b9 100644
--- a/HanddleAI/HandleAiUi-new/sqliteController/sqlControler.h
+++ b/HanddleAI/HandleAiUi-new/sqliteManager/sqlManager.h
@@ -10,13 +10,13 @@
 #include <sqlite3.h>
 #include <qdebug.h>
 #include <qfile.h>
-#include <sqliteController/sqliteModule.h>
+#include <sqliteManager/sqliteModule.h>
 #include "sqlStruct.h"
 #define sqlDefaultDatabasePath ".//sqlDatabase//sqlite-database.db"
 
 
 ////////////���߳����ڽ����ݴ���sqlite�ļ�/////////
-class sqlController : public QObject
+class sqlManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/HanddleAI/HandleAiUi-new/sqliteController/sqlStruct.h b/HanddleAI/HandleAiUi-new/sqliteManager/sqlStruct.h
similarity index 100%
rename from HanddleAI/HandleAiUi-new/sqliteController/sqlStruct.h
rename to HanddleAI/HandleAiUi-new/sqliteManager/sqlStruct.h
diff --git a/HanddleAI/HandleAiUi-new/sqliteController/sqliteModule.cpp b/HanddleAI/HandleAiUi-new/sqliteManager/sqliteModule.cpp
similarity index 99%
rename from HanddleAI/HandleAiUi-new/sqliteController/sqliteModule.cpp
rename to HanddleAI/HandleAiUi-new/sqliteManager/sqliteModule.cpp
index 9d117dbc..fd8c35fe 100644
--- a/HanddleAI/HandleAiUi-new/sqliteController/sqliteModule.cpp
+++ b/HanddleAI/HandleAiUi-new/sqliteManager/sqliteModule.cpp
@@ -1,4 +1,4 @@
-#include <sqliteController/sqliteModule.h>
+#include <sqliteManager/sqliteModule.h>
 #include <iostream>
 #include <qdebug.h>
 #include <io.h>
diff --git a/HanddleAI/HandleAiUi-new/sqliteController/sqliteModule.h b/HanddleAI/HandleAiUi-new/sqliteManager/sqliteModule.h
similarity index 100%
rename from HanddleAI/HandleAiUi-new/sqliteController/sqliteModule.h
rename to HanddleAI/HandleAiUi-new/sqliteManager/sqliteModule.h
diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_dumpToExcel.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_dumpToExcel.h
index ccff664a..2a22b4dc 100644
--- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_dumpToExcel.h
+++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_dumpToExcel.h
@@ -6,7 +6,7 @@
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <uiModule/uiModule_tableView.h>
-#include <sqliteController/sqlControler.h>
+#include <sqliteManager/sqlManager.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <QComboBox>
@@ -161,7 +161,7 @@ public:
 	}
 	void switchDate(std::string dateStr,std::string excelPath)
 	{
-		sqlController _sqlController;
+		sqlManager _sqlManager;
 		QString sqlCopiedFilePath;
 #pragma region 
 		QString path(sqlDefaultDatabasePath);
@@ -188,9 +188,9 @@ public:
 		}
 #pragma endregion �����ļ�
 #pragma region 
-		_sqlController.initPara(sqlCopiedFilePath.toStdString(), false);
-		//globalSqlDatas = _sqlController.selectAllData(dateStr);
-		_sqlController.dbPtr->Select(dateStr, {}, "", "", globalSqlDatas);
+		_sqlManager.initPara(sqlCopiedFilePath.toStdString(), false);
+		//globalSqlDatas = _sqlManager.selectAllData(dateStr);
+		_sqlManager.dbPtr->Select(dateStr, {}, "", "", globalSqlDatas);
 #pragma endregion sqlite������
 #pragma region
 		if (globalSqlDatas.rowDatas.size() == 0)
diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageView.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageView.h
index 27108537..7150fab5 100644
--- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageView.h
+++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageView.h
@@ -19,7 +19,7 @@
 #include "globalStruct.h"
 #include <qqueue.h>
 #include <qthread.h>
-class ImageWidgetController;
+class ImageWidgetManager;
 class SonGraphicsView :
     public QGraphicsView
 {
@@ -391,16 +391,16 @@ private:
     //QGraphicsPixmapItem* item;
     SonGraphicsView* view;
 };
-class ImageWidgetController :public QWidget
+class ImageWidgetManager :public QWidget
 {
 public:
     QGridLayout* Layout = new QGridLayout();
-    ImageWidgetController()
+    ImageWidgetManager()
     {
         this->setLayout(Layout);
         Layout->setContentsMargins(0, 0, 0, 0);
     }
-    ~ImageWidgetController()
+    ~ImageWidgetManager()
     {
     }
     ImageWidget* createViewer(QString nickName = "none")
diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataController.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h
similarity index 99%
rename from HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataController.h
rename to HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h
index 64409654..381b0975 100644
--- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataController.h
+++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h
@@ -5,7 +5,7 @@
 #include <uiModule/components/dashBoard.h>
 #include <uiModule/components/fancyProcessBar.h>
 #include <uiModule/components/fancyLogWindow.h>
-class summaryDataController
+class summaryDataManager
 {
 public:
     fancyWidget* widget;
@@ -17,7 +17,7 @@ public:
     QLabel* OKLabel2;
     QLabel* NGLabel2;
     QLabel* totalLabel2;
-    summaryDataController()
+    summaryDataManager()
     {
         QPalette palette;
         palette.setColor(QPalette::WindowText, Qt::white);
diff --git a/HanddleAI/sqliteReader/sqlControler.cpp b/HanddleAI/sqliteReader/sqlControler.cpp
index ce177c7e..8f4d8584 100644
--- a/HanddleAI/sqliteReader/sqlControler.cpp
+++ b/HanddleAI/sqliteReader/sqlControler.cpp
@@ -39,7 +39,7 @@ int callback(void* data, int argc, char** argv, char** azColName) {
 
 	return 0;
 }
-void sqlController::initPara()
+void sqlManager::initPara()
 {
 	QString destinationFilePath;
 	{//每次启动备份文件
@@ -73,7 +73,7 @@ void sqlController::initPara()
 		return;
 	}
 }
-void sqlController::checkCol(sqlite3* db, std::string tableName, std::string columnName) 
+void sqlManager::checkCol(sqlite3* db, std::string tableName, std::string columnName) 
 {
 	try 
 	{
@@ -108,7 +108,7 @@ void sqlController::checkCol(sqlite3* db, std::string tableName, std::string col
 	}
 
 }
-bool sqlController::addData(sqlDataStruct data)
+bool sqlManager::addData(sqlDataStruct data)
 {
 	if (data.SN.empty())//SN码为空，将停止处理
 	{
@@ -188,7 +188,7 @@ bool sqlController::addData(sqlDataStruct data)
 	sqlite3_finalize(statement);
 	return true;
 }
-int sqlController::checktSn(std::string SN)
+int sqlManager::checktSn(std::string SN)
 {
 	return 0;
 	std::string query = "SELECT COUNT(*) FROM \'" + getCurrentTableName() + "\' WHERE sn LIKE '" + SN + "%'; ";
@@ -226,7 +226,7 @@ int sqlController::checktSn(std::string SN)
 	return num;
 }
 #if 0
-sqlDataStruct sqlController::selectData(std::string SN, int snCountIndex, int send)
+sqlDataStruct sqlManager::selectData(std::string SN, int snCountIndex, int send)
 {
 	std::string query;
 	int rc;
@@ -268,7 +268,7 @@ sqlDataStruct sqlController::selectData(std::string SN, int snCountIndex, int se
 	return Respone;
 }
 #endif
-sqlDataStruct sqlController::selectData(std::string SN, std::string TableName)
+sqlDataStruct sqlManager::selectData(std::string SN, std::string TableName)
 {
 	std::string query;
 	int rc;
@@ -297,7 +297,7 @@ sqlDataStruct sqlController::selectData(std::string SN, std::string TableName)
 	}
 	return Respone;
 }
-void sqlController::uninitlize()
+void sqlManager::uninitlize()
 {
 	sqlite3_close(db);
 	remove(dataBasePath.c_str());
@@ -315,7 +315,7 @@ int TableCallback(void* data, int argc, char** argv, char** colName) {
 }
 
 // 函数来查询数据库中的所有表
-std::vector<std::string> sqlController::GetTables() {
+std::vector<std::string> sqlManager::GetTables() {
 	std::vector<std::string> tableList;
 	char* errorMsg = nullptr;
 
@@ -365,7 +365,7 @@ int DataCallback(void* data, int argc, char** argv, char** colName) {
 }
 
 // 查询SQLite数据库中的数据
-std::vector<sqlDataStruct> sqlController::getAllData(const std::string& tableName) {
+std::vector<sqlDataStruct> sqlManager::getAllData(const std::string& tableName) {
 	std::vector<sqlDataStruct> result;
 	char* errorMsg = nullptr;
 
diff --git a/HanddleAI/sqliteReader/sqlControler.h b/HanddleAI/sqliteReader/sqlControler.h
index d795870a..63d407b0 100644
--- a/HanddleAI/sqliteReader/sqlControler.h
+++ b/HanddleAI/sqliteReader/sqlControler.h
@@ -23,7 +23,7 @@ struct sqlDataStruct
 };
 
 ////////////���߳����ڽ����ݴ���sqlite�ļ�/////////
-class sqlController 
+class sqlManager 
 {
 public:
     std::string dataBasePath = ".//sqlDatabase//EVE-database.db";
diff --git a/HanddleAI/sqliteReader/sqliteReader.cpp b/HanddleAI/sqliteReader/sqliteReader.cpp
index fca9988f..5599066a 100644
--- a/HanddleAI/sqliteReader/sqliteReader.cpp
+++ b/HanddleAI/sqliteReader/sqliteReader.cpp
@@ -11,14 +11,14 @@ sqliteReader::sqliteReader(QWidget *parent)
 {
     ui.setupUi(this);
 	readIniFile(".//config//sqliteReader.ini");
-	sqlController.initPara();
-	std::vector<std::string> res=sqlController.GetTables();
+	sqlManager.initPara();
+	std::vector<std::string> res=sqlManager.GetTables();
 	widgetInit(res);
 }
 
 sqliteReader::~sqliteReader()
 {
-	sqlController.uninitlize();
+	sqlManager.uninitlize();
 }
 void sqliteReader::widgetInit(std::vector<std::string>tables)
 {
@@ -61,7 +61,7 @@ void sqliteReader::widgetInit(std::vector<std::string>tables)
 }
 void sqliteReader::switchWidget(std::string tableName)
 {
-	std::vector<sqlDataStruct> res = sqlController.getAllData(tableName);
+	std::vector<sqlDataStruct> res = sqlManager.getAllData(tableName);
 	tableWidget->clear();
 	delete tableWidget;
 	tableWidget = new QTableWidget();
@@ -117,7 +117,7 @@ void sqliteReader::switchWidget(std::string tableName)
 }
 void sqliteReader::searchSN(std::string tableName, std::string SN)
 {
-	sqlDataStruct res = sqlController.selectData(SN,tableName);
+	sqlDataStruct res = sqlManager.selectData(SN,tableName);
 	tableWidget->clear();
 	delete tableWidget;
 	tableWidget = new QTableWidget();
diff --git a/HanddleAI/sqliteReader/sqliteReader.h b/HanddleAI/sqliteReader/sqliteReader.h
index e9a8fdd6..e8df16aa 100644
--- a/HanddleAI/sqliteReader/sqliteReader.h
+++ b/HanddleAI/sqliteReader/sqliteReader.h
@@ -15,7 +15,7 @@ public:
     ~sqliteReader();
 	QVBoxLayout * layout1;
 	QTableWidget* tableWidget;
-	sqlController sqlController;
+	sqlManager sqlManager;
 	std::unordered_map<QString, QString>avoidMap;//����ʾ������
 	std::unordered_map<QString, QString>cuttomName;//�Զ�������
 	void widgetInit(std::vector<std::string>tables);
diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp
index c128f721899e1a2fd5f5ffe10a0335da718ee8af..b0d66668d858f227d6754c2baf6d937a46482b7c 100644
GIT binary patch
delta 119
zcmZo+o504I(#FK_9|%k)ayl~#O!U1k!otYF;LN}%$N&T`Rx!^0F0R3otr$JE)EPcE
zF);XMCKu%w=ckn@Xas30_;~txGZZq|3Nj>@ry!IsXVhQ}o_v8(oZV8-*x1z2a`HPy
NC#KI$lZ}`z0RZ19A_)Kh

delta 125
zcmbQh*22b_(#FK_9|$xiaym1zO!U3a_k)3f!Ipth5J)k&Sxt6e^i)w}$ZBL@@Xbsv
z$}i4OD^bu0(p2#A^z&xOX0R1xNG?wSDcsDcAzy4{U}O{%<{T4}pPy44;~NZQ8k*=C
XTj&`Z8yXu-{>A9Tl+`%dj_DEr(lI08

diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib
index b506c2adaff32453f920896da4a99bad9470fc31..b04150d66d0bd6f8780c0ea27f1bb8d8c729edd8 100644
GIT binary patch
delta 118
zcmaDN_(X8S0VbAz%oEN}KEiaIMV;Yu)8u~UVkRIpi(P879E$-XXW8l7S1&OzFfdI%
w$s|3wh_xQ3OnveMb`Gf0$qsCBoC?-nr@ui}noYjT)&o<i3{|;#7P}WC0EkK}1poj5

delta 118
zcmaDN_(X8S0VWpXY46@lKEiaIMU5e=adJO%F%yuQ#V)m3j>UkH^Ptn_hnE-_7?>uX
wWRjj-#99wirapNBI|o$hWCyl5&b6m&4}62FG@E>vtp}!38LD#gEOswO00)UE^Z)<=

diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp
index d51dd3479f00019389da4252121bf314da3584cb..9d36f208e63090eb446a0a738529affa6fea9ebe 100644
GIT binary patch
delta 138
zcmaFQ`kR$ArHzT<KM=@I<aB0YWt`}DMdT*~1A_$vqacuCaIuPU_IGg&o@~Hqr=`yD
zxru?nH#4~?zc@dwL_s4+Q^Cj6&zqr;!B&tVxjY4-d=jIEe6W#$kx@*Tb4*Bneok?W
eZ!nN)XrgCqsb_3#YG^t6CZiM6=cdWBOqT#Fw<yH`

delta 126
zcmey(`ks|DrHzT<KM)8{<aB2G$uQCH3g24>1_mPrMnNFO;AS=1jL}X-jUlU%fx$O3
zxhTIlKdnSTBS=%h$J5W7A)CQgkRiD|1*C8uqlSF3k%5s>Oqg>_NPd1!ag1*;kZEY5
YXKbNoY;0(3F!?E?6H`{>WKE_^0EXKoApigX

diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib
index c271a24edcc0cf6762f83aa447cf44b73e509d54..9c451b2ec75fbfd47c5b293388f4274cb1b1aa9e 100644
GIT binary patch
delta 108
zcmX>ha6({12NTP2)AOe%_b}~YQD^wvG}(taoe4<EvrBD0&n(Tzyo`Iz<hLwSVUp^T
r*Rpaz6->U!8q3<QRQvSx<o7J{lh-gwPtIj)gsD`9s@yEkuE_`h%y=iH

delta 108
zcmX>ha6({12NR3#l2yki_b}~YQDewzob1D#&IF|7*`+q0XO?DU7G=zs{FY@ZOj3RF
rT2>CIg2@+IV_DC4{(bR!@_QEf$!nOTC+D&?!c;0lRc@AN*JK0$_5&nj

diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp
index 632439471feaa9f2527a170eba4dfc45d83dc2b2..53c3f41bb783174fab318e70fe59d2e91f929057 100644
GIT binary patch
delta 138
zcmaFP`k9q8rHzT<KM;sd<aB0YWSr=CLF6j~1A_?zqacuCaIuPU_IGg&o~*-YrKQgB
zxru?nH#4~?zc@dwL_s4+Q^Cj6&zqr;!B&tVxjY4-yo*soKG?{>$S5YvIVL1OKc_gx
eHyFq?G|@A*)H60VHME?3k<p3ibJJu|rb_@5S15e|

delta 92
zcmey&`ka+BrHzT<KM-(F<aB2G$}rLI0^dsp1_nI_MnNFO;AS=1h|!8gjUlUXasi_#
rcQ%8qAVYF_3P@raqXuK~<o%4|>=t^)#)ifQlkYM*F##1SGF<`yB)uAn

diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib
index e7784b3ea75952388bfd4c57a0b8fb3be8e54022..f679fdae9df129fa1e4d394f63100284f9d61348 100644
GIT binary patch
delta 113
zcmbOrFhO8L2@~f(^@6+dj0_AMllj@qCU0h{Wl?AN+%!3kRef?avkeoF+0QDqc{8&x
wBa6wYtap=7u}pxe(1*yDvp75wyE2)JZ3j$3nad$LKes?HGX<)hmz|jr0D+b!iU0rr

delta 113
zcmbOrFhO8L2@@xiS>+3PMg|6s$^2|)lQ%QfvZyg+HBOFWRi7NqY{LX(_OnWD-pnk_
w$nsyM=EdYwEE8ZV^dYk4EOPCyj!oub+X0hM=5k2R&n?i)Oo3|WWoKpt0HB~E>;M1&

diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp
index f0a89b553a1d128975c713a0fcafda275f8da276..588ebc79337b83ef3ecbb3be1c634dd15f386be3 100644
GIT binary patch
delta 120
zcmeyu+Q7z{(#FK_9|%+?aym0{Fi!NlCh~`Yfx()AQ4mNmxLCzF`@6UXPc~w7)KX{o
z+{D1(o0(jcU!0#-qM#9^so>-3=gm;aU@ORwT%LkZKAlm6F?jL;MsapaJ!4~2L(9qc
O7@e3tH%(Szx&#1NA|mMk

delta 126
zcmZo*`@+hZ(#FK_9|$BSaym2pVVLN5jqd{k1A{38qacuCaI>0h!RV->#*o#>z~Gyi
zT$Ep&pH`xv5u~Z$<LT$kkj-E#$dFu~0#dk`QA57i$iT=bCd@e|BtJi=IL0>^$TT$3
YGq%t(Ha0XinEZ;-i7BgbvL4eV09LOg&;S4c

diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib
index 4010f0a3da11c6819056f7133313cf8a23370e79..578b535ee41c6c12f7e6ab81feeae0134eac1aaf 100644
GIT binary patch
delta 118
zcmew&@I_$53?`PPzk+^Dp2M`CMV;Yu)8u&OY^Kjmo6j&?F><Q1D%?25z`(#Xc_EYZ
yWG&Wmm=g8LXIMFa$|j#-mYV#5HICDzJLm2@s7kZRy=*NomC6W}(wk%1#Tfxr1S(Vj

delta 118
zcmew&@I_$53?`O;Zc(o%&tclnqQ;QbI60m<n<=Yt^BHC<M$WYxj6R)WU|?XHypTzH
yvKDJOOo{sBGprmyWs}b^OHKa38po+!d+_r+s7kZRy=*NomC6W}(wk%1#TfzcPAFIa

diff --git a/lib/Hd_MvCamera_module_GIGE.exp b/lib/Hd_MvCamera_module_GIGE.exp
index baf010b986a757bee8bb7ba502782da1266e9fea..0c571208bd38c3ff024fa40ed8fea30771d2e8c9 100644
GIT binary patch
delta 120
zcmey&`k$3ErHzT<KM*KS<aB0YXPoGFP2@KN1A`R<qacuCaIuPU_IGg&o@~VEpry|6
zxru?nH#4~?zc@dwL_s4+Q^Cj6&zqr;!B&tVxjY4-d>W$$WANntjN<H;dd9}4hL)4>
OGCDDRZknvfbO`{Dsv}(h

delta 126
zcmey*`k9q8rHzT<KM;sd<aB2G%`nmL8sB>c1_l!bMnNFO;AS=1g3&=mjUlU%fx$O3
zxhTIlKdnSTBS=%h$J5W7A)CQgkRiD|1*C8hqlSF3k%5s>Oqg>_NPd1!ag1*;kZEY5
YXKbNoY;0(3F!?2;6H`{>WL>690FnbGMF0Q*

diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib
index 110ae8d714ae9a153c870b6ea7d31787466ae1f1..f5ba12df64b2f2e149f3a1b7a1622e6c2dd11692 100644
GIT binary patch
delta 108
zcmaDN@I+w4BqkQ4S+m|wp2oC~MV;Yu)8tvK>XYl4otS{k)2vdP?=s6XvY5Ryxjl(>
s8ccycM6#SUOQrAa+sTZq@{`lp=D}o@xg3)7a|`q`Q=mrpvx_nU04H}TWB>pF

delta 108
zcmaDN@I+w4Bqo;p>l@!pp2oC~MU5e=aq=uy^~v?jPE0`NX;!JtcbVlGS)TPV-<!lb
s4W>XJB3aIQ)aT5(x04xJ<tL}H&4bA*b2%jE=N9N?ra+DGXBTAz0Nc$cc>n+a

diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp
index 72272a70ead1c7a3023873a763f290b25f1c8a31..59f77271cb443ce895a01c84da2ef9a0df05ac4b 100644
GIT binary patch
delta 120
zcmeyu+Q7z{(#FK_9|%+?aym0{Fi!NlCh~`Yfx()AQ4mNmxLCzF`@6UXPc~w7)KX{o
z+{D1(o0(jcU!0#-qM#9^so>-3=gm;aU@ORwT%LkZKAlm6F?jL;MsapaJ!4~2L(9qc
O7@e3tH%(Szx&#1NA|mMk

delta 126
zcmZo*`@+hZ(#FK_9|$BSaym2pVVLN5jqd{k1A{38qacuCaI>0h!RV->#*o#>z~Gyi
zT$Ep&pH`xv5u~Z$<LT$kkj-E#$dFu~0#dk`QA57i$iT=bCd@e|BtJi=IL0>^$TT$3
YGq%t(Ha0XinEZ;-i7BgbvL4eV09LOg&;S4c

diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib
index 8baafc1c7adb77e35051dfe8ea37dc3b629b4297..ff33633f3db52aec9c9ccb88fc9c624c2109a9d1 100644
GIT binary patch
delta 117
zcmew&@I_$53?}BnwZ|vVW;(#4&hWWuay)Z3)90qmXPB)RIsaXl@bDA^0|V3Kg-p_u
ywOGqxO4KKxVdVfSn|y{@YVrrxI8L`KOHaRpsx+J2%hm!@sf<u5y*ZX$oDl${*el)u

delta 117
zcmew&@I_$53?^o+dy^*5W;(#4#*o!GIi5M2DXVew8D=X+&JQ+8e@-zlFfdJC$Rs^k
xi?tl4M1ArZRt})D$!D0QCVya!<9s*6;o>`}O0&tmY%MUA$_SOxn`7C<83B{oC#(Pf

diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp
index 25890329510762a3f51d55c44ebc1ed66568465a..b96d9533757cd14f5748dc1def33ee7aa2d64350 100644
GIT binary patch
delta 139
zcmcc1{gRtArHzT<KM>rV$mz_ucBAiWMv;Y#3=B35jDie6;9?cy?C;_lJlT!ONlTsK
za}xuDZ)S2)esO+UiGoIurh<>BpEpAxgRLM#a(N0u`5Gn-`CuahBcqrw=a`WE{G8$#
g-(Voq&_vJJQqS1f)X;MBXQpRNpPM${W@cgn00B5E`v3p{

delta 109
zcmaFKeV3avrHzT<KM-7;$mz_uaHH>QM!u<x3=C!rjDie6;AS=1hsjArjUlU%fx$O3
zxhTIlKdnSTBS=%h$J5W7A)CQgkRiD|1*C8XlLlk)<cCb+>=t^)#)ifQlm9b4W6EmW
J{G6GI2>@mTAnyPG

diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib
index b3ff8f19c2b7f22a232105edac9723e1a30fca2a..7d987e797c1925944487933e8b6ed09e14a3773c 100644
GIT binary patch
delta 108
zcmew+^-XHSI~GpM+Y9dLGcqu6Oy0<0Hd&Xol|`N5bJHXa^~rZxU6?*MO*Z6^+HA|F
w%*Z-jM&-ik$!j^}C%3RyKvn5ORFt#4P6>N7c@4(_u=wNxPHmXh?VS6W0bcJXg#Z8m

delta 108
zcmew+^-XHSI~LA!vnzk<Gcqu6Oy0<0Hd&Xol|_vqt8o&C`sBN;E=*aClMOkfHrui(
wGqM(DI=(qQc`b+h<QDb{s49JkigFgyZwZelui-cV7N1<esSVS*opV1k00IFd)&Kwi

diff --git a/lib/Hd_VirtualCamera_ReadFile.exp b/lib/Hd_VirtualCamera_ReadFile.exp
index 97564e7ecf1b9a7dcd8759b5f7e475424bd0e889..2ab8a32736ff7ac0009d959e546fcdcc96397f2c 100644
GIT binary patch
delta 138
zcmey)+RVn8(#FK_9|+VZaym0{GEVfnA@Y}jfx(7>Q4mNmxLCzF`@6UXPc~t6(o$#m
z+{D1(o0(jcU!0#-qM#9^so>-3=gm;aU@ORwT%LkZK8sO9KG?{>$S5YvIVL1OKc_gx
eHyFq?G|@A*)H60VHME@kkkN_hbJJv1rb_?-o+yq0

delta 92
zcmZo>`_9Ul(#FK_9|)u;aym2pWtix9gYP2)1A`d@qacuCaI>0h#puMM#*o!Gxq(rX
rJDb5)kRiD|1thVIQG>B~@_9yab_+dYV?$$u$!{5*n1BimnJxhU8TcBz

diff --git a/lib/Hd_VirtualCamera_ReadFile.lib b/lib/Hd_VirtualCamera_ReadFile.lib
index 6ea40c154c26659195866f0264978b6461a5520a..758ab845a978ef76e6d8ef9c8d39482abf9ed17e 100644
GIT binary patch
delta 101
zcmZn=Y!KWqhl%A?*q<wt7cd=QQD^wvG<hAX`s8kA7pBimn=dlkGO}_vZoP7Pax|O#
qWFyuJm=b-U^yG`oQj>qO#<IwC%6ys}#Rk<c$F2>P+?>iT%?JPj5GH*9

delta 101
zcmZn=Y!KWqhl%A<cizd#3z!bDs4-+UPF}~VKDnFOg(<6X^F?M`M%EsFu3x7oN3+RK
pHe#)SDbWW?Prk@3HTfrNEQ_n;%14u<*r595*tMaOn^W1P838U>B7y(_