Merge branch 'LWQ' into liuyang

mrDarker

2025-08-22 f8ad0695ff2431cb90640be52b523d6434bdbf83

 EdgeInspector_App/Data/PostProcess.cpp

@@ -657,6 +657,16 @@
      double fontScale = 0.7;
      int thickness = 1;

         if (m_pHardware->m_bUse_SaveDLDefectImage==TRUE)
         {
            if (eCategory== DefectLoc_Chip|| eCategory== DefectLoc_Crack|| eCategory == DefectLoc_Burr|| eCategory == DefectLoc_In_Chip|| eCategory == DefectLoc_In_Burr|| eCategory == DefectLoc_UserDefect)
            {
               CT2CA pszConvertedAnsiDLFile(strDLFile);
               cv::String strDLFile(pszConvertedAnsiDLFile);
               cv::imwrite(strDLFile, imgTmp);
            }
         }

      CT2CA pszConvertedAnsiTitle(strTitle);
      cv::String strCVTitle(pszConvertedAnsiTitle);
      cv::putText(colorImg, strCVTitle, cv::Point(10, szImage.cy - 10), fontFace, fontScale, CV_RGB(255, 255, 255), thickness);
@@ -1462,9 +1472,10 @@
      }

      CString strSaveImagePath;
      CString strSaveImageDLPath;
      //strSaveImagePath.Format(_T("%s\\%03d_%s_%s_%s.jpg"),m_strDefectFolder,pNewDefect->m_nIdx, g_pBase->m_strHPanelID, PANEL_SIDE[pNewDefect->m_DefectInfo.m_nSideIdx], strDefectType);
      strSaveImagePath.Format(_T("%s\\%s_%s_%s_%d.jpg"),m_strDefectFolder, g_pBase->m_strHPanelID, PANEL_SIDE[pDefect->m_DefectInfo.m_nSideIdx], strDefectType, pDefect->m_nIdx);

      strSaveImageDLPath.Format(_T("%s\\%s_%s_%s_%d.bmp"),m_strImageDLFolder, g_pBase->m_strHPanelID, PANEL_SIDE[pDefect->m_DefectInfo.m_nSideIdx], strDefectType, pDefect->m_nIdx);
      CRect rectDefect;
      rectDefect.left      = DEFECTIMAGE_WIDTH/2   - pDefect->m_DefectInfo.m_rtDefectPos_pxl.Width()/2;
      rectDefect.right   = DEFECTIMAGE_WIDTH/2   + pDefect->m_DefectInfo.m_rtDefectPos_pxl.Width()/2;
@@ -1472,6 +1483,8 @@
      rectDefect.bottom   = DEFECTIMAGE_HEIGHT/2   + pDefect->m_DefectInfo.m_rtDefectPos_pxl.Height()/2;

      CheckDirectory(strSaveImagePath);
      CheckDirectory(strSaveImageDLPath);
      strDLFile.Format(_T("%s"), strSaveImageDLPath);
      // SaveDefectImage2(pNewDefect->m_Image,CSize(DEFECTIMAGE_WIDTH,DEFECTIMAGE_HEIGHT), rectDefect, strSaveImagePath);
      SaveDefectImage_with_Title(pDefect, CSize(DEFECTIMAGE_WIDTH,DEFECTIMAGE_HEIGHT), rectDefect, strSaveImagePath);

@@ -2003,6 +2016,9 @@
   m_strDefectFolder.Format(_T("%s\\IMG_DEFECT\\%s\\%s"),PATH_INSPECTION_DATA,g_pBase->m_strLoadingDay,g_pBase->m_strHPanelID);
   DeleteFolder(m_strDefectFolder);
   CheckDirectory(m_strDefectFolder,TRUE);
   m_strImageDLFolder.Format(_T("%s\\IMG_DEFECT_DL\\%s\\%s"), PATH_INSPECTION_DATA, g_pBase->m_strLoadingDay, g_pBase->m_strHPanelID);
   DeleteFolder(m_strImageDLFolder);
   CheckDirectory(m_strImageDLFolder, TRUE);
   m_strSplineFolder.Format(_T("%s\\SPLINE\\%s\\%s"),PATH_INSPECTION_DATA,g_pBase->m_strLoadingDay,g_pBase->m_strHPanelID);
   CheckDirectory(m_strSplineFolder);
   m_strFullImgeFolder.Format(_T("%s\\IMG_FULL\\%s\\%s"),PATH_INSPECTION_DATA,g_pBase->m_strLoadingDay,g_pBase->m_strHPanelID);