|
|
|
|
@ -623,6 +623,7 @@ int ImgCheckAnalysisy::Adapt_Config(Mat img, Rect cur_roi, bool b_update){
|
|
|
|
|
m_old_cur_markLine_mark1 = m_AnalysisyConfig.baseFunction.markLine.mark_local_1;
|
|
|
|
|
m_old_cur_markLine_mark2 = m_AnalysisyConfig.baseFunction.markLine.mark_local_2;
|
|
|
|
|
m_old_cur_regionConfigArr = m_AnalysisyConfig.commonCheckConfig.nodeConfigArr[0].regionConfigArr;
|
|
|
|
|
m_old_cur_traditional_region = m_AnalysisyConfig.baseFunction.traditionDet.detArea;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*计算old_roi到new_roi的完整仿射变换矩阵(平移+缩放+旋转)*/
|
|
|
|
|
@ -660,6 +661,7 @@ int ImgCheckAnalysisy::Adapt_Config(Mat img, Rect cur_roi, bool b_update){
|
|
|
|
|
cv::Point& cur_markLine_mark1 = m_AnalysisyConfig.baseFunction.markLine.mark_local_1;
|
|
|
|
|
cv::Point& cur_markLine_mark2 = m_AnalysisyConfig.baseFunction.markLine.mark_local_2;
|
|
|
|
|
std::vector<RegionConfigST>& cur_regionConfigArr = m_AnalysisyConfig.commonCheckConfig.nodeConfigArr[0].regionConfigArr;
|
|
|
|
|
std::vector<cv::Point>& cur_traditional_region = m_AnalysisyConfig.baseFunction.traditionDet.detArea;
|
|
|
|
|
|
|
|
|
|
// if (img.empty())
|
|
|
|
|
// {
|
|
|
|
|
@ -717,6 +719,9 @@ int ImgCheckAnalysisy::Adapt_Config(Mat img, Rect cur_roi, bool b_update){
|
|
|
|
|
cur_regionConfigArr[i].basicInfo.pointArry[j] = affinePoint(m_old_cur_regionConfigArr[i].basicInfo.pointArry[j]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for(int i = 0; i < cur_traditional_region.size(); i++){
|
|
|
|
|
cur_traditional_region[i] = affinePoint(m_old_cur_traditional_region[i]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*show*/
|
|
|
|
|
// if (img.empty())
|
|
|
|
|
@ -1846,6 +1851,9 @@ int ImgCheckAnalysisy::Traditional_Detect_Thread(const cv::Mat &img, cv::Mat &Re
|
|
|
|
|
cp.nFilterHigh = traditionParam.nFilterHigh;
|
|
|
|
|
cp.nAreaFilter = traditionParam.nAreaFilter;
|
|
|
|
|
cp.nCountFilter = traditionParam.nCountFilter;
|
|
|
|
|
cp.productId = DetImgInfo_shareP->strImgProductID;
|
|
|
|
|
cp.productChannel = m_strCurDetChannel;
|
|
|
|
|
cp.bDebugsaveImg = DetImgInfo_shareP->bsaveProcessImg;
|
|
|
|
|
m_tcsCheck.SetChecConfig(&cp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|