dsuser/ds-628
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级到c++11，在存图文件夹不存在时自动创建，修复大量以byte为变量名的问题

Browse Source
This commit is contained in:
rci
2024-09-30 15:36:39 +08:00
parent ddde443cc9
commit a90d0d2471
45 changed files with 833 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BaseModules/Hd_LogicDll_module/Logic_hdataprocess.cpp
+7 -7
View File
@@ -463,7 +463,7 @@ QByteArray HAlgorithmData::getAlgorithmData(QString SNdataTime,QString cameraNam
{
Algorithm_Result_Data value = algorithm_resultData_S[i];
algorithm_resultData_S.removeAt(i);
return value.byte;
return value.byteArray;
}
}
}
@@ -485,7 +485,7 @@ QByteArray HAlgorithmData::getAlgorithmData(QString SNdataTime,QString cameraNam
QByteArray HAlgorithmData::getIndexData(Algorithm_Result_Data result_data, int result_index, QString algorithm_result_index)
{
//qDebug() << __FUNCTION__ << " line: " << __LINE__ << " algorithmKey:" << algorithmKey << " cameraName_and_index: " << cameraName_and_index << " result_data.byte len:" << result_data.byte.length();
//qDebug() << __FUNCTION__ << " line: " << __LINE__ << " algorithmKey:" << algorithmKey << " cameraName_and_index: " << cameraName_and_index << " result_data.byteArray len:" << result_data.byteArray.length();
Algorithm_Result_Data_index index_pack;
if (map_delete_Result_index.keys().contains(result_data.key_index))
@@ -503,10 +503,10 @@ QByteArray HAlgorithmData::getIndexData(Algorithm_Result_Data result_data, int r
QString cameraName = list.at(0);
QString task_index = list.at(1);
//Logic_taskthread运行算法/汇总模块后，返回的数据
QByteArray byte = result_data.byte;
QByteArray byteArray = result_data.byteArray;
//result_data.byte转
QByteArrayList vec_Data;
vec_Data = byte.split('#');
vec_Data = byteArray.split('#');
if (vec_Data.isEmpty())
{
@@ -520,7 +520,7 @@ QByteArray HAlgorithmData::getIndexData(Algorithm_Result_Data result_data, int r
return index_byte;
}
index_byte = vec_Data[algorithm_result_index.toInt()];// byte;// QByteArray::fromStdString(sendMsg);
index_byte = vec_Data[algorithm_result_index.toInt()];// byteArray;// QByteArray::fromStdString(sendMsg);
// 删除map中的数据
if (vec_Data.size() == 1)
@@ -619,7 +619,7 @@ bool HAlgorithmExecData::getDetectData(testData& picVec)
picVec.cameraName = picVec1.cameraName; // 提取名称
picVec.task_index = picVec1.task_index; // 任务下标
picVec.byte = picVec1.byte;
picVec.byteArray = picVec1.byteArray;
for (int i = 0; i < m_detectData.head().dstImageMat.size(); i++)
{
cv::Mat img = cv::Mat();
@@ -810,7 +810,7 @@ void HStationData::addAlgorithmResultData(QString algorithmKey, QString index, Q
}
}
Algorithm_Result_Data result_data;
result_data.byte = NG_data;
result_data.byteArray = NG_data;
result_data.SN_dataTime = SN_datatime;
if (algorithm_ptr)