Ongoing100 #3517 CF AOI Review 자가진단 기능 개선

LYW

2021-09-23 c08b701c90c8998b241c82638d5c488e03238214

 ReviewSystem/ReviewSystem/DlgDefectList.cpp

@@ -15,9 +15,9 @@
int      Defect_width[DEFECTLISTCNT]      = {        50,           80,             80, 50,         50,        40,         40,         45,          45,         50,        50,            80,             80         };

// [2017:6:7]-[WEZASW] : BOE향
#define B7_DEFECTLISTCNT      13
TCHAR*   B7_Defect_Titlelist[B7_DEFECTLISTCNT]   = { _T("No"), _T("RV_X(mm)"), _T("RV_Y(mm)"), _T("DType"), _T("MType"),  _T("SType"), _T("DLength"), _T("Area"), _T("Peak"), _T("Cam"), _T("DType1"), _T("AOI_X(mm)"), _T("AOI_Y(mm)")};
int      B7_Defect_width[B7_DEFECTLISTCNT]      = {      40,           75,             75,      75,         75,            50,         60,            45,         45,         40,         60,            80,            80     };
#define B7_DEFECTLISTCNT      14
TCHAR*   B7_Defect_Titlelist[B7_DEFECTLISTCNT]   = { _T("No"), _T("RV_X(mm)"), _T("RV_Y(mm)"), _T("DType"), _T("MType"),  _T("SType"),_T("DCode"), _T("DLength"), _T("Area"), _T("Peak"), _T("Cam"), _T("DType1"), _T("AOI_X(mm)"), _T("AOI_Y(mm)")};
int      B7_Defect_width[B7_DEFECTLISTCNT]      = {      40,           75,             75,      75,         50,            50,        55,          60,         45,         45,         40,         60,            80,            80     };



@@ -148,7 +148,7 @@

   m_bAsending = !m_bAsending;

   if(nCol==3 || nCol==4 || nCol==5 || nCol==10)
   if(nCol==3 || nCol==4 || nCol==5 || nCol==6)//210608
   {
      vector< pair<CString,CDefectResult*> > vec;

@@ -162,14 +162,17 @@
            vec.push_back(make_pair(pDefectResult->strDefectType, pDefectResult));            
            break;
         case 4:
            vec.push_back(make_pair(pDefectResult->strMarkType, pDefectResult));				
            vec.push_back(make_pair(pDefectResult->strJudgeType, pDefectResult));				
            break;
         case 5:
            vec.push_back(make_pair(pDefectResult->strSizeType, pDefectResult));	
            vec.push_back(make_pair(pDefectResult->strSizeType, pDefectResult));
            break;
         case 10:
            vec.push_back(make_pair(pDefectResult->strDefectType1, pDefectResult));	
         case 6:
            vec.push_back(make_pair(pDefectResult->strDefectJudgeCode, pDefectResult));	
            break;
            /*case 11:
               vec.push_back(make_pair(pDefectResult->strDefectType1, pDefectResult));
               break;*/
         default:
            continue;
         }
@@ -207,13 +210,13 @@
         case 0: nValue = pDefectResult->nDefectIdx; break;         // _T("No")
         case 1: nValue = pDefectResult->nUMOriginX; break;         // _T("RV_X(mm)")
         case 2: nValue = pDefectResult->nUMOriginY; break;         // _T("RV_Y(mm)")
         case 6: nValue = pDefectResult->nAOISizeLength; break;      // _T("DLength")
         case 7: nValue = pDefectResult->nAOIArea; break;            // _T("Area")
         case 8: nValue = pDefectResult->nAOIPeak; break;            // _T("Peak")
         case 9: nValue = pDefectResult->nAOICameraIdx; break;      // _T("Cam")
         case 10: nValue = pDefectResult->nAOIScanIdx; break;      // _T("Cam")
         case 11: nValue = pDefectResult->dUMCenterOriginX; break;   // _T("AOI_X(mm)")
         case 12: nValue = pDefectResult->dUMCenterOriginY; break;   // _T("AOI_Y(mm)")
         case 7: nValue = pDefectResult->nAOISizeLength; break;      // _T("DLength")
         case 8: nValue = pDefectResult->nAOIArea; break;            // _T("Area")
         case 9: nValue = pDefectResult->nAOIPeak; break;            // _T("Peak")
         case 10: nValue = pDefectResult->nAOICameraIdx; break;      // _T("Cam")
         case 11: nValue = pDefectResult->nAOIScanIdx; break;      // _T("Cam")
         case 12: nValue = pDefectResult->dUMCenterOriginX; break;   // _T("AOI_X(mm)")
         case 13: nValue = pDefectResult->dUMCenterOriginY; break;   // _T("AOI_Y(mm)")
         default: continue;
         }

@@ -260,13 +263,14 @@
   case 3: strItem = _T("DType"); break;
   case 4: strItem = _T("Judge"); break;
   case 5: strItem = _T("SType"); break;
   case 6: strItem = _T("DLength"); break;
   case 7: strItem = _T("Area"); break;
   case 8: strItem = _T("Peak"); break;
   case 9: strItem = _T("Cam"); break;
   case 10: strItem = _T("ScanN"); break;
   case 11: strItem = _T("AOI_X(mm)"); break;
   case 12: strItem = _T("AOI_Y(mm)"); break;
   case 6: strItem = _T("DCODE"); break;
   case 7: strItem = _T("DLength"); break;
   case 8: strItem = _T("Area"); break;
   case 9: strItem = _T("Peak"); break;
   case 10: strItem = _T("Cam"); break;
   case 11: strItem = _T("ScanN"); break;
   case 12: strItem = _T("AOI_X(mm)"); break;
   case 13: strItem = _T("AOI_Y(mm)"); break;
   default: break;
   }
}
@@ -346,39 +350,44 @@
         strItem.Format(_T("%s"), pDefectResult->strSizeType);
      }
      break;
   case 6:      //S_Type
   {
      strItem.Format(_T("%s"), pDefectResult->strDefectJudgeCode);//210608
   }
   break;

   case 6:      //DLength
   case 7:      //DLength
      {
         strItem.Format(_T("%d"), (int)pDefectResult->nAOISizeLength);
      }
      break;
   case 7:      //Area
   case 8:      //Area
      {
         strItem.Format(_T("%d"), (int)pDefectResult->nAOIArea);
      }
      break;
   case 8:      //Peak
   case 9:      //Peak
      {
         strItem.Format(_T("%d"), pDefectResult->nAOIPeak);
      }
      break;
   case 9:      //Cam
   case 10:      //Cam
      {
         strItem.Format(_T("%d"), pDefectResult->nAOICameraIdx);
      }
      break;
   case 10:   //D_Type1
   case 11:   //D_Type1
      {
      //   strItem.Format(_T("%s"), pDefectResult->strDefectType1);
      strItem.Format(_T("%d"), pDefectResult->nAOIScanIdx);
      }
      break;
   case 11:   //AOI_X(mm)
   case 12:   //AOI_X(mm)
      {
         strItem.Format(_T("%.03lf"), pDefectResult->dUMCenterOriginX / 1000.);
      }
      break;
   case 12:   //AOI_Y(mm)
   case 13:   //AOI_Y(mm)
      {
         strItem.Format(_T("%.03lf"), pDefectResult->dUMCenterOriginY / 1000.);
      }