基础代码更新

BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp

@@ -1,4 +1,4 @@
-#include "Hd_LogicDll_module.h"
+#include "Hd_LogicDll_module.h"
 
 Hd_LogicDll_module* create()
 {
@@ -17,7 +17,7 @@ void destory(Hd_LogicDll_module* ptr)
 }
 
 bool ifRunLogicDll = false;
-//类创建
+//类创建
 Hd_LogicDll_module::Hd_LogicDll_module()
 {
     my_task = new Logic_processtask(this);
@@ -25,9 +25,9 @@ Hd_LogicDll_module::Hd_LogicDll_module()
     ifRunLogicDll = true;
     Sleep(10);
 
-    //无法用信号槽传递图像!!
-    //connect(my_task, SIGNAL(LsendImage(QString, cv::Mat)), this, SLOT(processtask_sendImage(QString, cv::Mat)));     // 传递图片
-    connect(my_task, SIGNAL(LwriteData(QString, QString, QString, QByteArray)), this, SLOT(processtask_writeData(QString, QString, QString, QByteArray)));// 传递数据
+    //无法用信号槽传递图像!!
+    //connect(my_task, SIGNAL(LsendImage(QString, cv::Mat)), this, SLOT(processtask_sendImage(QString, cv::Mat)));     // 传递图片
+    connect(my_task, SIGNAL(LwriteData(QString, QString, QString, QByteArray)), this, SLOT(processtask_writeData(QString, QString, QString, QByteArray)));// 传递数据
     connect(my_task, SIGNAL(sendTcpStatus(bool)), this, SLOT(processtask_sendTcpStatus(bool)));
     connect(my_task, SIGNAL(cameraDisconnect(QString, bool)), this, SLOT(processtask_cameraDisconnect(QString, bool)));
     QFuture<void>muf = QtConcurrent::run(this, &Hd_LogicDll_module::check_LsendImgStruct);
@@ -41,12 +41,12 @@ void Hd_LogicDll_module::check_LsendImgStruct()
         //if (my_task->Lqueue_sendImgStruct.size() > 0)
             while (my_task->getImageData(myL))
             {
-                QMutexLocker locker(sendImgStructMutex);  // 加锁
+                QMutexLocker locker(sendImgStructMutex);  // 加锁
                 /*sendImgStruct mS;
                 mS.send_Mat = myL.send_Mat;
                 mS.cameraKey_index = myL.cameraKey_index;*/
 
-                ////堆积了，只显示最新的
+                ////堆积了，只显示最新的
                 //for (int i = 0; i < queue_sendImgStruct.size(); i++)
                 //    if (myL.cameraKey_index == queue_sendImgStruct[i].cameraKey_index)
                 //    {
@@ -95,7 +95,7 @@ QString json_cfg_file_path;
 QJsonObject m_jsonObj;
 
 
-//封装为dll，里面读写文件无法实现
+//封装为dll，里面读写文件无法实现
 //QJsonObject Hd_LogicDll_module::loadJsonCfg(QString)
 //{
 //    QJsonObject json_object;