Ongoing50 #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 - 우선...

LYW

2021-06-09 65d45cae3268e08a78362b608711f70483a087c0

 ReviewSystem/CHReviewPrioritySorter/PrioritySorter_CPJT.cpp

@@ -125,11 +125,11 @@

      for(constMapDefectResultIt it=pMapDefectResult->begin();it!=pMapDefectResult->end();it++)
      {
         //pDefectResult는 MapDefectResult<int,CDefectResult>에서 2번째 값
         //pDefectResult�� MapDefectResult<int,CDefectResult>���� 2��° ��
         pDefectResult = static_cast<CDefectResult*>(it->second);
         if(pDefectResult == NULL || pDefectResult->bReviewAdded==TRUE) continue;

         if(pDefectResult->nDefectCode ==2) continue; //고객사 요청사항 190609 chm Crack 안찍기 
         if(pDefectResult->nDefectCode ==2) continue; //����� ��û���� 190609 chm Crack ����� 

         if(pPriorityInfo->GetPriorityDefectSizeOption())
         {
@@ -186,13 +186,13 @@
      m_vecDefectResultPtrTemp.clear();
   }

   // 결함 우선순위 정렬결과 출력
   // ���� �켱���� ���İ�� ���
   CString strFilename = _T("");
   //strFilename.Format(_T("C:\\Users\\dit-344\\Desktop\\testfile\\Sorting_Review.csv"));
   strFilename.Format(_T("D:\\Sorting_Review.csv"));
   SaveDefectPoint(m_vecDefectResultPtr, strFilename);

   // 결과 만들기
   // ��� �����
   return AddReviewDefectResult();
}

@@ -225,11 +225,11 @@

      for(constMapDefectResultIt it=pMapDefectResult->begin();it!=pMapDefectResult->end();it++)
      {
         //pDefectResult는 MapDefectResult<int,CDefectResult>에서 2번째 값
         //pDefectResult�� MapDefectResult<int,CDefectResult>���� 2��° ��
         pDefectResult = static_cast<CDefectResult*>(it->second);
         if(pDefectResult == NULL) continue;
             
         if(pDefectResult->nDefectCode == 2)continue; //고객사 요청사항 190609 chm Crack 안찍기 
         if(pDefectResult->nDefectCode == 2)continue; //����� ��û���� 190609 chm Crack ����� 
         
         //if(pDefectResult->nLocation == DefectLoc_ASG || pDefectResult->nLocation == DefectLoc_PAD || pDefectResult->nLocation == DefectLoc_C2C)   continue;

@@ -286,7 +286,7 @@
      m_vecDefectResultPtrTemp.clear();
   }

   // 결함 우선순위 정렬결과 출력
   // ���� �켱���� ���İ�� ���
   CString strFilename = _T("");
   //   strFilename.Format(_T("D:\\Sorting_Wsi_temp1.csv"));
   //   SaveDefectPoint(vecDefectResultPtrTemp1, strFilename);
@@ -297,7 +297,7 @@
   //   strFilename.Format(_T("D:\\Sorting_Wsi.csv"));
   //   SaveDefectPoint(m_vecDefectResultPtr, strFilename);

   // 결과 만들기..
   // ��� �����..
   return AddWsiDefectResult();
}

@@ -361,7 +361,7 @@
   {
      const CRcpUserDefectInfo *pDefectInfo = m_pRsRcpReviewInfo->GetRcpUserDefectInfo(nPointIdx);
      if (pDefectInfo==NULL) continue;
      if (pDefectInfo->m_nInspectionMode != 0) continue; // _T("WSI") 일 경우 continue 20181218 smok
      if (pDefectInfo->m_nInspectionMode != 0) continue; // _T("WSI") �� ��� continue 20181218 smok

      sResult.Reset();

@@ -446,7 +446,7 @@
   {
      const CRcpUserDefectInfo *pInfo = m_pRsRcpReviewInfo->GetRcpUserDefectInfo(nPointIdx);
      if (pInfo==NULL) continue;
      if (pInfo->m_nInspectionMode != 1) continue; // _T("REVIEW") 일 경우 continue 20181218 smok
      if (pInfo->m_nInspectionMode != 1) continue; // _T("REVIEW") �� ��� continue 20181218 smok

      sResult.Reset();

@@ -620,9 +620,16 @@
   if (pPriorityInfo==NULL || pDefectResult==NULL) return FALSE;

   // check Type
   if (pPriorityInfo->GetPriorityOpticData() != RCP_PRIORITY_ORDER_OPTIC_ALL)
	
   //if (pPriorityInfo->GetPriorityOpticData() != RCP_PRIORITY_ORDER_OPTIC_ALL)
   //{
   //	
   //   //if (pDefectResult->nDefectCode != pPriorityInfo->GetPriorityOpticData()) return FALSE;
   //}
   //210608 Defect Code �� ä�¼� ���� ��û 
   if (pPriorityInfo->GetPriorityDefectCode() != RCP_PRIORITY_DEFECT_CODE_ALL)
   {
      if (pDefectResult->nDefectCode != pPriorityInfo->GetPriorityOpticData()) return FALSE;
      if (pDefectResult->nDefectJudgeCode != pPriorityInfo->GetPriorityDefectCode()) return FALSE;
   }

   if (pPriorityInfo->GetPriorityGradeData() != RCP_PRIORITY_Judge_ALL)
@@ -715,7 +722,7 @@

      if (pPriorityInfo->GetPriorityModelData() < 0)return FALSE;

      //레시피 인덱스 Model0 -> 1 그래서 -1 
      //������ �ε��� Model0 -> 1 �׷��� -1 
      if (pDefectResult->nMultiModel != pPriorityInfo->GetPriorityModelData() - 1)return FALSE;

   }
@@ -824,7 +831,7 @@

      if (pPriorityInfo->GetPriorityModelData() < 0)return FALSE;

      //레시피 인덱스 Model0 -> 1 그래서 -1 
      //������ �ε��� Model0 -> 1 �׷��� -1 
      if (pDefectResult->nMultiModel != pPriorityInfo->GetPriorityModelData()-1)return FALSE;

   }
@@ -848,7 +855,7 @@
      return nTotalPointCount;
   }
   CDefectResult* pDefectResult = NULL;
   const CRcpSortingInfo* pSortingInfo = m_pRsRcpReviewInfo->GetRcpWSISortInfo(); //WSI 가져다 쓰기 
   const CRcpSortingInfo* pSortingInfo = m_pRsRcpReviewInfo->GetRcpWSISortInfo(); //WSI ������ ���� 
   if (pSortingInfo == NULL) return FALSE;

   int nCount = m_pRsRcpReviewInfo->GetRcpWsiPriorityInfoCount();
@@ -863,11 +870,11 @@

      for (constMapDefectResultIt it = pMapDefectResult->begin(); it != pMapDefectResult->end(); it++)
      {
         //pDefectResult는 MapDefectResult<int,CDefectResult>에서 2번째 값
         //pDefectResult�� MapDefectResult<int,CDefectResult>���� 2��° ��
         pDefectResult = static_cast<CDefectResult*>(it->second);
         if (pDefectResult == NULL) continue;

         if (pDefectResult->nDefectCode == 2)continue; //고객사 요청사항 190609 chm Crack 안찍기 
         if (pDefectResult->nDefectCode == 2)continue; //����� ��û���� 190609 chm Crack ����� 

         //if (pDefectResult->nLocation == DefectLoc_ASG || pDefectResult->nLocation == DefectLoc_PAD || pDefectResult->nLocation == DefectLoc_C2C)   continue;

@@ -924,7 +931,7 @@
      m_vecDefectResultPtrTemp.clear();
   }

   // 결함 우선순위 정렬결과 출력
   // ���� �켱���� ���İ�� ���
   CString strFilename = _T("");
   //   strFilename.Format(_T("D:\\Sorting_Wsi_temp1.csv"));
   //   SaveDefectPoint(vecDefectResultPtrTemp1, strFilename);
@@ -935,7 +942,7 @@
   //   strFilename.Format(_T("D:\\Sorting_Wsi.csv"));
   //   SaveDefectPoint(m_vecDefectResultPtr, strFilename);

   // 결과 만들기..
   // ��� �����..
   return AddWsiMultishotDefectResult();
}