zhangzhi
/
AJX-ZYWL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化NG判断

Browse Source
master
xiewenji 2 weeks ago
parent cb6ca12d4e
commit f1b4ee142b
3 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File

16
Down_Det/src/Down_Detect.cpp
Unescape View File

@ -87,7 +87,7 @@ int Down_Detect::CheckRun()
t1 = CheckUtil::getcurTime();
CheckImgInit();
cv::Mat detimg = DetImgInfo_shareP->img;
//准备结果图
// 准备结果图
cv::resize(detimg.clone(), m_CheckResult_shareP->resultImg, cv::Size(800, 600));
if (detimg.empty())
{
@ -115,12 +115,16 @@ int Down_Detect::CheckRun()
re = ImgAlinRotate(detimg, AlignImg);
if (0 != re)
{
// 失败NG
m_CheckResult_shareP->nresult = 1;
return re;
}
// 缺陷检测
re = DetectImg(AlignImg);
if (0 != re)
{
// 失败NG
m_CheckResult_shareP->nresult = 1;
return re;
}
t2 = CheckUtil::getcurTime();
@ -309,15 +313,15 @@ int Down_Detect::Draw(const cv::Mat &img, cv::Mat &resultimg)
// int x = center.x - w / 2;
// int y = center.y - h / 2;
// // 确保裁剪区域不超出图像边界
// x = std::max(0, x);
// y = std::max(0, y);
// x = std::min(x, img.cols - w);
// y = std::min(y, img.rows - h);
// // 创建裁剪区域
// cv::Rect cropRoi(x, y, w, h);
// cv::Rect cropRoi(x, y, w, h);
// resultimg = resultimg(cropRoi).clone();
// cv::polylines(resultimg, m_CheckBaseConfig->pointArry, true, cv::Scalar(0, 255, 0), 2);
@ -488,7 +492,7 @@ int Down_Detect::ImgAlinRotate(const cv::Mat &img, cv::Mat &alignImg)
return 1;
}
//判断尺寸
// 判断尺寸
int w = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_width_mm / m_CheckBaseConfig->imageScaleParam.fScale_X;
int h = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_height_mm / m_CheckBaseConfig->imageScaleParam.fScale_Y;
auto w_offset = std::abs(w - m_AlignMaxRoi.width);
@ -497,7 +501,7 @@ int Down_Detect::ImgAlinRotate(const cv::Mat &img, cv::Mat &alignImg)
int param_h_offset = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_height_offset_mm / m_CheckBaseConfig->imageScaleParam.fScale_Y;
if (w_offset > param_w_offset || h_offset > param_h_offset)
{
printf("Align error, no product\n");
printf("Align error, no product\n");
return 1;
}

4
Side_Det/src/Side_Detect.cpp
Unescape View File

@ -116,12 +116,16 @@ int Side_Detect::CheckRun()
re = ImgAlinRotate(detimg, AlignImg);
if (0 != re)
{
//失败NG
m_CheckResult_shareP->nresult = 1;
return re;
}
// 缺陷检测
re = DetectImg(AlignImg);
if (0 != re)
{
//失败NG
m_CheckResult_shareP->nresult = 1;
return re;
}
t2 = CheckUtil::getcurTime();

34
TOP_Det/src/Top_Detect.cpp
Unescape View File

@ -86,7 +86,7 @@ int Top_Detect::CheckRun()
t1 = CheckUtil::getcurTime();
CheckImgInit();
cv::Mat detimg = DetImgInfo_shareP->img;
//准备结果图
// 准备结果图
cv::resize(detimg.clone(), m_CheckResult_shareP->resultImg, cv::Size(800, 600));
if (detimg.empty())
{
@ -114,12 +114,16 @@ int Top_Detect::CheckRun()
re = ImgAlinRotate(detimg, AlignImg);
if (0 != re)
{
// 失败NG
m_CheckResult_shareP->nresult = 1;
return re;
}
// 缺陷检测
re = DetectImg(AlignImg);
if (0 != re)
{
// 失败NG
m_CheckResult_shareP->nresult = 1;
return re;
}
t2 = CheckUtil::getcurTime();
@ -308,13 +312,13 @@ int Top_Detect::Draw(const cv::Mat &img, cv::Mat &resultimg)
// int x = center.x - w / 2;
// int y = center.y - h / 2;
// // 确保裁剪区域不超出图像边界
// x = std::max(0, x);
// y = std::max(0, y);
// x = std::min(x, img.cols - w);
// y = std::min(y, img.rows - h);
// // 创建裁剪区域
// cv::Rect cropRoi(x, y, w, h);
// resultimg = resultimg(cropRoi);
@ -487,18 +491,18 @@ int Top_Detect::ImgAlinRotate(const cv::Mat &img, cv::Mat &alignImg)
return 1;
}
//判断尺寸
int w = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_width_mm / m_CheckBaseConfig->imageScaleParam.fScale_X;
int h = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_height_mm / m_CheckBaseConfig->imageScaleParam.fScale_Y;
auto w_offset = std::abs(w - m_AlignMaxRoi.width);
auto h_offset = std::abs(h - m_AlignMaxRoi.height);
int param_w_offset = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_width_offset_mm / m_CheckBaseConfig->imageScaleParam.fScale_X;
int param_h_offset = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_height_offset_mm / m_CheckBaseConfig->imageScaleParam.fScale_Y;
if (w_offset > param_w_offset || h_offset > param_h_offset)
{
printf("Align error, no product\n");
return 1;
}
// 判断尺寸
int w = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_width_mm / m_CheckBaseConfig->imageScaleParam.fScale_X;
int h = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_height_mm / m_CheckBaseConfig->imageScaleParam.fScale_Y;
auto w_offset = std::abs(w - m_AlignMaxRoi.width);
auto h_offset = std::abs(h - m_AlignMaxRoi.height);
int param_w_offset = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_width_offset_mm / m_CheckBaseConfig->imageScaleParam.fScale_X;
int param_h_offset = m_CheckBaseConfig->baseCheckFunction.detconfig.chip_height_offset_mm / m_CheckBaseConfig->imageScaleParam.fScale_Y;
if (w_offset > param_w_offset || h_offset > param_h_offset)
{
printf("Align error, no product\n");
return 1;
}
DetRotateType ratio = m_CheckBaseConfig->baseCheckFunction.detconfig.rotate;
std::cout << "rotate ratio : " << ratio << std::endl;

Write Preview
Loading…
Cancel
Save