v1.3.4

AlgorithmModule/src/ImgCheckAnalysisy.cpp

@@ -170,7 +170,7 @@ int ImgCheckAnalysisy::GetStatus()
 
 std::string ImgCheckAnalysisy::GetVersion()
 {
-	return std::string("BOE_1.3.3_" + std::string(__DATE__) + "_" + std::string(__TIME__));
+	return std::string("BOE_1.3.4_" + std::string(__DATE__) + "_" + std::string(__TIME__));
 }
 
 std::string ImgCheckAnalysisy::GetErrorInfo()
@@ -528,6 +528,16 @@ int ImgCheckAnalysisy::CheckRun()
 
 		m_CheckResult_shareP->resultMaskImg = m_pImageAllResult->qx_DetAIResult->AI_MaskImg;
 
+		// 将BQ标签的AI mask合并到结果mask中
+		if (m_pImageAllResult->bq_DetAIResult && !m_pImageAllResult->bq_DetAIResult->AI_MaskImg.empty())
+		{
+			cv::Mat &bqMask = m_pImageAllResult->bq_DetAIResult->AI_MaskImg;
+			if (bqMask.size() == m_CheckResult_shareP->resultMaskImg.size())
+			{
+				cv::bitwise_or(m_CheckResult_shareP->resultMaskImg, bqMask, m_CheckResult_shareP->resultMaskImg);
+			}
+		}
+
 		// cv::imwrite("dddddddd.png", m_pImageAllResult->qx_DetAIResult->AI_MaskImg);
 		// if (!m_pImageAllResult->qx_DetAIResult->AI_MaskImg.empty())
 		// {