From 24c135e43c3597e2a72eea19c7340a9cc25475dc Mon Sep 17 00:00:00 2001 From: "15089880081@163.com" <15089880081@163.com> Date: Sat, 2 Nov 2024 01:15:48 +0800 Subject: [PATCH] update --- .gitignore | 7 +-- .../Hd_3DCameraLMI_module_PointCloud (2).zip | Bin 0 -> 6554 bytes .../Hd_3DCameraLMI_module_PointCloud (3).zip | Bin 0 -> 6355 bytes .../Hd_3DCameraLMI_module_PointCloud (4).zip | Bin 0 -> 6352 bytes .../Hd_3DCameraLMI_module.cpp | 45 +++--------------- .../hd_mvcamera_module.cpp | 2 +- HanddleAI/HanddleAi/detProcess.hpp | 7 +-- 7 files changed, 15 insertions(+), 46 deletions(-) create mode 100644 BaseModules/Hd_3DCameraLMI_module_PointCloud (2).zip create mode 100644 BaseModules/Hd_3DCameraLMI_module_PointCloud (3).zip create mode 100644 BaseModules/Hd_3DCameraLMI_module_PointCloud (4).zip 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 0000000000000000000000000000000000000000..5b3f4f6ecb117970376dd93db84cd85b81913fbd GIT binary patch literal 6554 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 M&#m15mCynI1?ZI#Z2$lO literal 0 HcmV?d00001 diff --git a/BaseModules/Hd_3DCameraLMI_module_PointCloud (3).zip b/BaseModules/Hd_3DCameraLMI_module_PointCloud (3).zip new file mode 100644 index 0000000000000000000000000000000000000000..a5ccb61c640237f59ea021181b8a555abc829951 GIT binary patch literal 6355 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 Q_&@j4pQ>>GCFp?v0<>SW82|tP literal 0 HcmV?d00001 diff --git a/BaseModules/Hd_3DCameraLMI_module_PointCloud (4).zip b/BaseModules/Hd_3DCameraLMI_module_PointCloud (4).zip new file mode 100644 index 0000000000000000000000000000000000000000..262bd6500dd6d4e58d08adbd8d7b426b41b86642 GIT binary patch literal 6352 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 PpZ)RAtMLA1=z#wK@$AGy literal 0 HcmV?d00001 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() {