diff --git a/BaseModules/algoModules/Hd_LogicDll_module/CMakeLists.txt b/BaseModules/Hd_LogicDll_module/CMakeLists.txt similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/CMakeLists.txt rename to BaseModules/Hd_LogicDll_module/CMakeLists.txt diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp b/BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp rename to BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.h b/BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.h rename to BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.cpp b/BaseModules/Hd_LogicDll_module/Logic_camera_thread.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.cpp rename to BaseModules/Hd_LogicDll_module/Logic_camera_thread.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.h b/BaseModules/Hd_LogicDll_module/Logic_camera_thread.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.h rename to BaseModules/Hd_LogicDll_module/Logic_camera_thread.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.cpp b/BaseModules/Hd_LogicDll_module/Logic_hdataintegration.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.cpp rename to BaseModules/Hd_LogicDll_module/Logic_hdataintegration.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.h b/BaseModules/Hd_LogicDll_module/Logic_hdataintegration.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.h rename to BaseModules/Hd_LogicDll_module/Logic_hdataintegration.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.cpp b/BaseModules/Hd_LogicDll_module/Logic_hdataprocess.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.cpp rename to BaseModules/Hd_LogicDll_module/Logic_hdataprocess.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.h b/BaseModules/Hd_LogicDll_module/Logic_hdataprocess.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.h rename to BaseModules/Hd_LogicDll_module/Logic_hdataprocess.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.cpp b/BaseModules/Hd_LogicDll_module/Logic_myiothread.cpp similarity index 99% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.cpp rename to BaseModules/Hd_LogicDll_module/Logic_myiothread.cpp index 3f3c057..b8d471a 100644 --- a/BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.cpp +++ b/BaseModules/Hd_LogicDll_module/Logic_myiothread.cpp @@ -1,5 +1,5 @@ #include "Logic_myiothread.h" - +#include //QString trigger_signal_condition_name = ""; //QMutex *commond_pack_lock = new QMutex; static int startSign[4] = { 0 }; @@ -1123,14 +1123,14 @@ void Logic_myiothread::checkTriggerCameraSub( //一个信号,对应相机拍多张图? // 添加被触发的相机名称;运行相机及取图 - if (!m_pack.vector_camera.isEmpty()){ + if (!m_pack.vector_camera.isEmpty()) { QStringList trigger_camera_name_getImgNumS; - for (int val = 0; val < m_pack.vector_camera.size(); val++){ + for (int val = 0; val < m_pack.vector_camera.size(); val++) { QString trigger_camera_name_getImgNum = m_pack.vector_camera.at(val) + "_" + trigger_getImgNum; - if (!trigger_camera_name_getImgNum.isEmpty()){ + if (!trigger_camera_name_getImgNum.isEmpty()) { //多工站需考虑加锁? //注意,信号不可重入。 //开线程去运行;一个信号对应相机拍多张图的情况 @@ -1146,9 +1146,13 @@ void Logic_myiothread::checkTriggerCameraSub( yh_getImageSignal.append({ QString::number(vec_value.at(trigger_index)), QString::number(vec_value.at(trigger_index + 2)), QString::number(vec_value.at(trigger_index + 4)), - QString::number(vec_value.at(trigger_index + 6)) }); + QString::number(vec_value.at(trigger_index + 6)) }); #endif - m_runAndCheck_cameraThread->runCameraKey_num.enqueue(trigger_camera_name_getImgNumS); + //{ + // //在此因入队发生报错,因此加锁操作 + // QMutexLocker lockerx(&m_runAndCheck_cameraThread->runCameraKey_num_Lock); + // m_runAndCheck_cameraThread->runCameraKey_num.enqueue(trigger_camera_name_getImgNumS); + //} if (!m_pack.trigger_signal_condition.isEmpty()) { station_list.value(m_stationName)->set_trigger_signal(trigger_signal); @@ -1649,7 +1653,7 @@ runAndCheck_cameraThread::runAndCheck_cameraThread(QObject* parent) } runAndCheck_cameraThread::~runAndCheck_cameraThread() { - runCameraKey_num.clear(); + //runCameraKey_num.clear(); qDebug() << __FUNCTION__ << "line:" << __LINE__ << " delete success! "; } diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.h b/BaseModules/Hd_LogicDll_module/Logic_myiothread.h similarity index 98% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.h rename to BaseModules/Hd_LogicDll_module/Logic_myiothread.h index 828cef9..270c81b 100644 --- a/BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.h +++ b/BaseModules/Hd_LogicDll_module/Logic_myiothread.h @@ -1,6 +1,7 @@ #ifndef Logic_myiothread_H #define Logic_myiothread_H +#include #include #include #include @@ -80,7 +81,8 @@ public: bool ifTaskDoneFlag = false; //是否检查任务完成标志(按照SN容器是否为空) //要运行的相机key_取图次数 - QQueue runCameraKey_num; + //QMutex runCameraKey_num_Lock;; + //QQueue runCameraKey_num; QMap map_trigger_signal_pack; // 相机信号触发包 diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.cpp b/BaseModules/Hd_LogicDll_module/Logic_processtask.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.cpp rename to BaseModules/Hd_LogicDll_module/Logic_processtask.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.h b/BaseModules/Hd_LogicDll_module/Logic_processtask.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.h rename to BaseModules/Hd_LogicDll_module/Logic_processtask.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.cpp b/BaseModules/Hd_LogicDll_module/Logic_taskthread.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.cpp rename to BaseModules/Hd_LogicDll_module/Logic_taskthread.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.h b/BaseModules/Hd_LogicDll_module/Logic_taskthread.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.h rename to BaseModules/Hd_LogicDll_module/Logic_taskthread.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/base.h b/BaseModules/Hd_LogicDll_module/base.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/base.h rename to BaseModules/Hd_LogicDll_module/base.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/base_Logic.h b/BaseModules/Hd_LogicDll_module/base_Logic.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/base_Logic.h rename to BaseModules/Hd_LogicDll_module/base_Logic.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/nlohmannJson.hpp b/BaseModules/Hd_LogicDll_module/nlohmannJson.hpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/nlohmannJson.hpp rename to BaseModules/Hd_LogicDll_module/nlohmannJson.hpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/rlib/detData.h b/BaseModules/Hd_LogicDll_module/rlib/detData.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/rlib/detData.h rename to BaseModules/Hd_LogicDll_module/rlib/detData.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/rlib/fileManager.h b/BaseModules/Hd_LogicDll_module/rlib/fileManager.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/rlib/fileManager.h rename to BaseModules/Hd_LogicDll_module/rlib/fileManager.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp b/BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp rename to BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h b/BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h rename to BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/struct.h b/BaseModules/Hd_LogicDll_module/struct.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/struct.h rename to BaseModules/Hd_LogicDll_module/struct.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/test.h b/BaseModules/Hd_LogicDll_module/test.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/test.h rename to BaseModules/Hd_LogicDll_module/test.h diff --git a/BaseModules/algoModules/Hd_LogicDll_module/toolkit.cpp b/BaseModules/Hd_LogicDll_module/toolkit.cpp similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/toolkit.cpp rename to BaseModules/Hd_LogicDll_module/toolkit.cpp diff --git a/BaseModules/algoModules/Hd_LogicDll_module/toolkit.h b/BaseModules/Hd_LogicDll_module/toolkit.h similarity index 100% rename from BaseModules/algoModules/Hd_LogicDll_module/toolkit.h rename to BaseModules/Hd_LogicDll_module/toolkit.h diff --git a/BaseModules/hardwareModules/rpc_finsTcp/json_rpc_server.exe b/BaseModules/hardwareModules/rpc_finsTcp/json_rpc_server_1_0_0.exe similarity index 100% rename from BaseModules/hardwareModules/rpc_finsTcp/json_rpc_server.exe rename to BaseModules/hardwareModules/rpc_finsTcp/json_rpc_server_1_0_0.exe diff --git a/BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.cpp b/BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.cpp index 7dd42af..677072e 100644 --- a/BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.cpp +++ b/BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.cpp @@ -145,7 +145,7 @@ bool rpc_finsTcp::writeData(std::vector& vec_mat, QByteArray& data){ bool rpc_finsTcp::initParas(QByteArray& data){ - startProcess("./json_rpc_server.exe"); + startProcess("./json_rpc_server_1_0_0.exe"); write_JsonRpcClient = new JsonRpcClientSubThread(m_IP,m_port); connect(this, &rpc_finsTcp::writeCallSignal, write_JsonRpcClient, &JsonRpcClientSubThread::writeCallSlot); diff --git a/BaseModules/hardwareModules/rpc_finsTcp/使用说明.txt b/BaseModules/hardwareModules/rpc_finsTcp/使用说明.txt new file mode 100644 index 0000000..b1ea0f9 --- /dev/null +++ b/BaseModules/hardwareModules/rpc_finsTcp/使用说明.txt @@ -0,0 +1,4 @@ +ʹÓÃǰ°Ñrpc_server.exe¸´ÖƵ½binÖÐ +ÇëÎðÐ޸ÄexeÃû³ÆÒÔʵÏְ汾¿ØÖÆ +writeHeart_short_Dxxxx_xx ²»»á´òӡµ½ÈÕ־ÖÐ +write_xxxx_Dxxx_null ²»»ᷢËÍÊý¾Ý \ No newline at end of file diff --git a/优化5.zip b/优化2_0_0.zip similarity index 56% rename from 优化5.zip rename to 优化2_0_0.zip index 28f11f9..a412866 100644 Binary files a/优化5.zip and b/优化2_0_0.zip differ