diff --git a/.gitignore b/.gitignore index 4b1cf834..7143d67e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ ################################################################################ /.vs -/.out -/.lib -/.bin \ No newline at end of file +/out +/lib +/bin +/env \ No newline at end of file diff --git a/BaseModules/Hd_3DCameraLMI_module_PointCloud (2).zip b/BaseModules/Hd_3DCameraLMI_module_PointCloud (2).zip new file mode 100644 index 00000000..5b3f4f6e Binary files /dev/null and b/BaseModules/Hd_3DCameraLMI_module_PointCloud (2).zip differ diff --git a/BaseModules/Hd_3DCameraLMI_module_PointCloud (3).zip b/BaseModules/Hd_3DCameraLMI_module_PointCloud (3).zip new file mode 100644 index 00000000..a5ccb61c Binary files /dev/null and b/BaseModules/Hd_3DCameraLMI_module_PointCloud (3).zip differ diff --git a/BaseModules/Hd_3DCameraLMI_module_PointCloud (4).zip b/BaseModules/Hd_3DCameraLMI_module_PointCloud (4).zip new file mode 100644 index 00000000..262bd650 Binary files /dev/null and b/BaseModules/Hd_3DCameraLMI_module_PointCloud (4).zip differ diff --git a/BaseModules/Hd_3DCameraLMI_module_PointCloud/Hd_3DCameraLMI_module.cpp b/BaseModules/Hd_3DCameraLMI_module_PointCloud/Hd_3DCameraLMI_module.cpp index f9235639..aef04403 100644 --- a/BaseModules/Hd_3DCameraLMI_module_PointCloud/Hd_3DCameraLMI_module.cpp +++ b/BaseModules/Hd_3DCameraLMI_module_PointCloud/Hd_3DCameraLMI_module.cpp @@ -328,10 +328,11 @@ bool Hd_3DCameraLMI_module::sendData(std::vector& vecPic, QByteArray &d if (queuePic.empty()) { //qDebug() << " [Error] " << " srcImage is null"; - genBlackImg(vecPic); + //genBlackImg(vecPic); m_mutex->unlock(); return false; } + triggerIng = false; vector dstvec = queuePic.dequeue(); queuePic.clear(); m_mutex->unlock(); @@ -380,59 +381,25 @@ bool Hd_3DCameraLMI_module::run() //qDebug() << "[info]" << __FUNCTION__ << " line:" << __LINE__ << " run start" << id; try { - //方法1 超时机制 - // queuePic.clear(); - //int timeOut = 0; - //while (timeOut < 500)//ms - //{ - // m_mutex->lock(); - // if (queuePic.size() > 0) - // { - // result = true; - // m_mutex->unlock(); - // return true; - // } - // m_mutex->unlock(); - // timeOut ++; - // QThread::msleep(1);//修改了ç�¡çœ 1ms - //} - - //方法2 在下一次触å�‘时强制给上一次触å�‘补黑图 - m_mutex->lock(); if (triggerIng == true)//ä»�然在处ç�†ä¸Šä¸€æ¬¡è§¦å�‘ { std::vectorimgs; genBlackImg(imgs); + m_mutex->lock(); queuePic.enqueue(imgs); m_mutex->unlock(); int cnt = 0; - while (queuePic.size() > 0 || cnt < 100) + while (queuePic.size() > 0 && cnt < 30) { QThread::msleep(1); cnt++; if (cnt > 10) - qDebug() << "insert black img 2 long"; + qDebug() << "insert black img 2 long queueSize"<< queuePic.size(); } } else - { triggerIng = true; - m_mutex->unlock(); - } - //强制给上一次触å�‘补黑图 结æ�Ÿ - while (true) - { - m_mutex->lock(); - if (queuePic.size() > 0) - { - result = true; - triggerIng = false; - m_mutex->unlock(); - return true; - } - m_mutex->unlock(); - QThread::msleep(1); - } + } catch (QString ev) { diff --git a/BaseModules/Hd_MvCamera_module_Hard/hd_mvcamera_module.cpp b/BaseModules/Hd_MvCamera_module_Hard/hd_mvcamera_module.cpp index 0d0b787e..72d7174c 100644 --- a/BaseModules/Hd_MvCamera_module_Hard/hd_mvcamera_module.cpp +++ b/BaseModules/Hd_MvCamera_module_Hard/hd_mvcamera_module.cpp @@ -310,7 +310,7 @@ bool Hd_MvCamera_module::reciveData(std::vector& mat, QByteArray& data) bool Hd_MvCamera_module::initParas(QByteArray&) { - //return true; + return true; if (!Username.compare("dummy")) { qDebug() << "[INFO] " << " start" << "--UserName: dummy creat sucess"; diff --git a/HanddleAI/HanddleAi/detProcess.hpp b/HanddleAI/HanddleAi/detProcess.hpp index 4edafc4e..b8aa1118 100644 --- a/HanddleAI/HanddleAi/detProcess.hpp +++ b/HanddleAI/HanddleAi/detProcess.hpp @@ -9,6 +9,7 @@ #include #include #include +#include class detProcess : public QThread { public: @@ -45,14 +46,14 @@ public: cameraManager _cameraManager;//Ïà»ú lightSourceManager _lightSourceManager;//¹âÔ´ - triggerManager _triggerManager;//MODBUS´¥·¢Æ÷ + triggerManager _triggerManager;//´¥·¢Æ÷ manualDetThread _manualDetThread;//ÊÖ¶¯´¥·¢Ïß³Ì heartbeatThread* _heartbeatThread;//ÐÄÌøÏß³Ì summaryData* _summaryData;// »ã×ÜÊý¾Ý autoDelete* autoDeleteThread; - + hardwareMonitor _hardwareMonitor;//Ó²¼þ¼à¿Ø CPU ÄÚ´æ //Ïà»ú - camera* _2dCamera, *_3dCamera; + camera* _2dCamera = nullptr, *_3dCamera = nullptr; //³õʼ»¯ void run() {