From 23a8043d32c02a6b01e768f7adcf72d595aee5a9 Mon Sep 17 00:00:00 2001 From: liusiyang Date: Wed, 16 Sep 2026 17:02:15 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=80=9A=E9=81=93=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AlgorithmModule/src/QX_Merge_Analysis.cpp | 2 ++ ConfigModule/include/CheckConfigDefine.h | 3 +++ ConfigModule/src/JsonConfig.cpp | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/AlgorithmModule/src/QX_Merge_Analysis.cpp b/AlgorithmModule/src/QX_Merge_Analysis.cpp index fa80a18..6570975 100644 --- a/AlgorithmModule/src/QX_Merge_Analysis.cpp +++ b/AlgorithmModule/src/QX_Merge_Analysis.cpp @@ -1184,6 +1184,8 @@ int QX_Merge_Analysis::Analysis_AD_Bind(ALL_Qx_DataList *pALLTypeqxList, int qx_ vector second_channel_2s = pAd_checkParma->analysis_bind.second_channel_2s; vector main_channel_3s = pAd_checkParma->analysis_bind.main_channel_3s; vector second_channel_3s = pAd_checkParma->analysis_bind.second_channel_3s; + /* 获取关联通道 */ + vector correlated_channels = pAd_checkParma->analysis_bind.correlated_channels; m_pMergedetlog->AddCheckstr(PrintLevel_2, 3, "Analysis_AD_Bind", "bind main_2s %d second_2s %d main_3s %d second_3s %d", (int)main_channel_2s.size(), (int)second_channel_2s.size(), (int)main_channel_3s.size(), (int)second_channel_3s.size()); diff --git a/ConfigModule/include/CheckConfigDefine.h b/ConfigModule/include/CheckConfigDefine.h index 94c6536..42c6e7a 100644 --- a/ConfigModule/include/CheckConfigDefine.h +++ b/ConfigModule/include/CheckConfigDefine.h @@ -1586,6 +1586,7 @@ struct AD_Analysisy_Bind std::vector second_channel_2s; std::vector main_channel_3s; std::vector second_channel_3s; + std::vector correlated_channels; AD_Analysisy_Bind() { @@ -1598,6 +1599,7 @@ struct AD_Analysisy_Bind second_channel_2s.clear(); main_channel_3s.clear(); second_channel_3s.clear(); + correlated_channels.clear(); } void copy (AD_Analysisy_Bind tem) { @@ -1606,6 +1608,7 @@ struct AD_Analysisy_Bind this->second_channel_2s = tem.second_channel_2s; this->main_channel_3s = tem.main_channel_3s; this->second_channel_3s = tem.second_channel_3s; + this->correlated_channels = tem.correlated_channels; } std::string GetInfo(std::string str) { diff --git a/ConfigModule/src/JsonConfig.cpp b/ConfigModule/src/JsonConfig.cpp index 6eb015c..6c8a069 100644 --- a/ConfigModule/src/JsonConfig.cpp +++ b/ConfigModule/src/JsonConfig.cpp @@ -1472,6 +1472,16 @@ int BaseFuntonConfigJson::GetFunction(Json::Value value) } } + value_qx = value_f["form"]["Bind_Channel"]["correlated_channels"]; + if (value_qx.isArray()) + { + for (int idx = 0; idx < value_qx.size(); idx++) + { + std::string channel = value_qx[idx].asString(); + _config.ad_check.analysis_bind.correlated_channels.push_back(channel); + } + } + // 同画面分析 value_qx = value_f["form"]["Single_Channel"]["s_channel"]; if (value_qx.isArray())