Compare commits

..

No commits in common. '9d3164ebcb26c9d8e8ea585dd3278faca3a3c685' and '085e06bb875b1337cb0ff4909e508aae1e3f5312' have entirely different histories.

@ -170,7 +170,7 @@ int ImgCheckAnalysisy::GetStatus()
std::string ImgCheckAnalysisy::GetVersion()
{
return std::string("BOE_1.3.4_" + std::string(__DATE__) + "_" + std::string(__TIME__));
return std::string("BOE_1.3.3_" + std::string(__DATE__) + "_" + std::string(__TIME__));
}
std::string ImgCheckAnalysisy::GetErrorInfo()
@ -528,16 +528,6 @@ 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())
// {

Loading…
Cancel
Save