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::vectorstrVec({ 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 #include #include -#include +#include #include . -#include +#include #include #include 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& 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 -#include -#include -#include -#include -backEndController::backEndController() -{ - _jsonConfiguration = new jsonConfiguration(); - _triggerController = new triggerController(); - _cameraController = new cameraController(); - _threadConroller = new threadConroller(); - std::vector> 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 +#include +#include +#include +#include +backEndManager::backEndManager() +{ + _jsonConfiguration = new jsonConfiguration(); + _triggerManager = new triggerManager(); + _cameraManager = new cameraManager(); + _threadConroller = new threadConroller(); + std::vector> 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 #include -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 -#include +#include +#include #include #include #include @@ -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 #include #include @@ -11,16 +11,16 @@ #include #include #include -#include +#include //Ó²´¥·¢ÒªÇóÔÚ´¥·¢Ïà»úǰ¸ø³ö´¥·¢ÐźŠ-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; QQueueimgQueue; - 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_mapcameras;//key Ïà»úÃû void run() { @@ -105,7 +105,7 @@ public: } private: bool loadModule(QString keyName, QString moduleName, QByteArray initByte); - backEndController* _backEndController; + backEndManager* _backEndManager; std::vectorcamerasVec;//ÓÃÓÚ³õʼ»¯ºÍÏú»Ù std::vector 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 #include "struct.h" #include -#include +#include #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 -#include -#include - -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 +#include +#include + +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 #include #include -#include +#include #include #include -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 +#include #include "camera_thread.h" #include "myiothread.h" #include @@ -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 #include #include -#include +#include #include #include #include @@ -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(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_mapmap; - //std::maptstMap; + QLinkedList 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 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 -#include +#include +#include #include -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 #include #include #include #include #include -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 /// /// ¼ì²â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 #include #include -#include +#include 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 #include #include -#include +#include #include #include -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"); qRegisterMetaType("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 +#include #include //è€�代ç � std::vector 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 data) +bool sqlManager::addData(std::string SN,std::vector data) { if (SN.empty())//SNç �为空,将å�œæ­¢å¤„ç�† { @@ -172,7 +172,7 @@ bool sqlController::addData(std::string SN,std::vector 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 #include #include -#include +#include #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 +#include #include #include #include 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 #include #include -#include +#include #include #include #include @@ -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 #include -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 #include #include -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 sqlController::GetTables() { +std::vector sqlManager::GetTables() { std::vector tableList; char* errorMsg = nullptr; @@ -365,7 +365,7 @@ int DataCallback(void* data, int argc, char** argv, char** colName) { } // 查询SQLiteæ•°æ�®åº“中的数æ�® -std::vector sqlController::getAllData(const std::string& tableName) { +std::vector sqlManager::getAllData(const std::string& tableName) { std::vector 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 res=sqlController.GetTables(); + sqlManager.initPara(); + std::vector res=sqlManager.GetTables(); widgetInit(res); } sqliteReader::~sqliteReader() { - sqlController.uninitlize(); + sqlManager.uninitlize(); } void sqliteReader::widgetInit(std::vectortables) { @@ -61,7 +61,7 @@ void sqliteReader::widgetInit(std::vectortables) } void sqliteReader::switchWidget(std::string tableName) { - std::vector res = sqlController.getAllData(tableName); + std::vector 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_mapavoidMap;//²»ÏÔʾ¸ÃÊý¾Ý std::unordered_mapcuttomName;//×Ô¶¨ÒåÁÐÃû void widgetInit(std::vectortables); diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index c128f721..b0d66668 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.exp and b/lib/Hd_3DCameraLMI_module_PointLazer.exp differ diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index b506c2ad..b04150d6 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.lib and b/lib/Hd_3DCameraLMI_module_PointLazer.lib differ diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp index d51dd347..9d36f208 100644 Binary files a/lib/Hd_DalsaCamera_module.exp and b/lib/Hd_DalsaCamera_module.exp differ diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib index c271a24e..9c451b2e 100644 Binary files a/lib/Hd_DalsaCamera_module.lib and b/lib/Hd_DalsaCamera_module.lib differ diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp index 63243947..53c3f41b 100644 Binary files a/lib/Hd_FinsTcp_module.exp and b/lib/Hd_FinsTcp_module.exp differ diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index e7784b3e..f679fdae 100644 Binary files a/lib/Hd_FinsTcp_module.lib and b/lib/Hd_FinsTcp_module.lib differ diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp index f0a89b55..588ebc79 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.exp and b/lib/Hd_MvCamera_module_GENTL.exp differ diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib index 4010f0a3..578b535e 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.lib and b/lib/Hd_MvCamera_module_GENTL.lib differ diff --git a/lib/Hd_MvCamera_module_GIGE.exp b/lib/Hd_MvCamera_module_GIGE.exp index baf010b9..0c571208 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.exp and b/lib/Hd_MvCamera_module_GIGE.exp differ diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib index 110ae8d7..f5ba12df 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.lib and b/lib/Hd_MvCamera_module_GIGE.lib differ diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp index 72272a70..59f77271 100644 Binary files a/lib/Hd_ResultsSummary_module.exp and b/lib/Hd_ResultsSummary_module.exp differ diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib index 8baafc1c..ff33633f 100644 Binary files a/lib/Hd_ResultsSummary_module.lib and b/lib/Hd_ResultsSummary_module.lib differ diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp index 25890329..b96d9533 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.exp and b/lib/Hd_SocketModule_ModbusTcp.exp differ diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index b3ff8f19..7d987e79 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.lib and b/lib/Hd_SocketModule_ModbusTcp.lib differ diff --git a/lib/Hd_VirtualCamera_ReadFile.exp b/lib/Hd_VirtualCamera_ReadFile.exp index 97564e7e..2ab8a327 100644 Binary files a/lib/Hd_VirtualCamera_ReadFile.exp and b/lib/Hd_VirtualCamera_ReadFile.exp differ diff --git a/lib/Hd_VirtualCamera_ReadFile.lib b/lib/Hd_VirtualCamera_ReadFile.lib index 6ea40c15..758ab845 100644 Binary files a/lib/Hd_VirtualCamera_ReadFile.lib and b/lib/Hd_VirtualCamera_ReadFile.lib differ