优化命名

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" )

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);

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;

HanddleAI/HandleAiUi-new/back/backEndController.cpp

@@ -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;
-}

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;
+}

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*);

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);
 }

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;//没啥用，一直保持为空就好

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")
 // 模块线程
 

HanddleAI/HandleAiUi-new/back/imgSaveThreadController.cpp

@@ -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);
-}

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);
+}

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;	
 };

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));

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:

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;

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;
     

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;

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中某位置的值是否和输入一样，使用了绝对位置

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()
 	{

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();

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:

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;

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:

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>

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)

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")

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);

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;
 

HanddleAI/sqliteReader/sqlControler.h

@@ -23,7 +23,7 @@ struct sqlDataStruct
 };
 
 ////////////此线程用于将数据存入sqlite文件/////////
-class sqlController 
+class sqlManager 
 {
 public:
     std::string dataBasePath = ".//sqlDatabase//EVE-database.db";

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();

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);