버그 수정

LYW

2021-09-14 ffe71aadfdcb4a9ea2ac4d8d320983d42ef3cad5

 ReviewSystem/ReviewRecipeEditor/DlgReview.cpp

@@ -236,19 +236,24 @@
         const CRcpPriorityInfo* pRcpPriorityInfo = pRsRcpReviewInfo->GetRcpWsiPriorityInfo(i);
         if (pRcpPriorityInfo == NULL) continue;

         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx);
         /*pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx);
         if(pCellCombo)
         {
            strArrayOption.RemoveAll();
            pCellCombo->GetOptions(strArrayOption);

            if(strArrayOption.GetSize() > 0)
            {
            {*/
               //strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityOpticData());
               strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityDefectCode()); //WSI ������ //20210608
               //strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityDefectCode()); //WSI ������ //20210608
               //m_ctrlGridFilterinfo.SetItemText(nRowIdx, nColIdx++, strItemText);

               //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD START
               strItemText.Format(_T("%s"), pRcpPriorityInfo->GetPriorityDefectCode());
               m_ctrlGridFilterinfo.SetItemText(nRowIdx, nColIdx++, strItemText);
            }
         }
               //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD END
         //   }
         //}


         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx);
@@ -285,7 +290,8 @@

            if(strArrayOption.GetSize() > 0)
            {
               strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityStackData());
               //LYW ERR수정
               strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityGrayData());
               m_ctrlGridFilterinfo.SetItemText(nRowIdx, nColIdx++, strItemText);
            }
         }
@@ -357,19 +363,24 @@
         const CRcpPriorityInfo* pRcpPriorityInfo = pRsRcpReviewInfo->GetRcpPriorityInfo(i);
         if (pRcpPriorityInfo == NULL) continue;

         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx);
         /*pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx);
         if(pCellCombo)
         {
            strArrayOption.RemoveAll();
            pCellCombo->GetOptions(strArrayOption);

            if(strArrayOption.GetSize() > 0)
            {
            {*/
               //strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityOpticData());
               strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityDefectCode());//20210608 TRDF ������
               //strItemText = strArrayOption.GetAt(pRcpPriorityInfo->GetPriorityDefectCode());//20210608 TRDF ������
               //m_ctrlGridFilterinfo.SetItemText(nRowIdx, nColIdx++, strItemText);

               //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD START
               strItemText.Format(_T("%s"), pRcpPriorityInfo->GetPriorityDefectCode());
               m_ctrlGridFilterinfo.SetItemText(nRowIdx, nColIdx++, strItemText);
            }
         }
               //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD END
         /*   }
         }*/

         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx);
         if(pCellCombo)
@@ -672,25 +683,30 @@
         if(pRcpPriorityInfo == NULL) continue;

         // optic
         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         if(pCellCombo)
         {
            strArrayOption.RemoveAll();
            strItemText = pCellCombo->GetText();
            pCellCombo->GetOptions(strArrayOption);
            nArrayCount = (int)strArrayOption.GetCount();
         //pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         //if(pCellCombo)
         //{
         //   strArrayOption.RemoveAll();
         //   strItemText = pCellCombo->GetText();
         //   pCellCombo->GetOptions(strArrayOption);
         //   nArrayCount = (int)strArrayOption.GetCount();

            for(j = 0; j < nArrayCount; j++)
            {
               strTemp = strArrayOption.GetAt(j);
               if(strTemp.Compare(strItemText) == 0)
               {
                  //pRcpPriorityInfo->SetPriorityOpticData(j);//20210608
                  pRcpPriorityInfo->SetPriorityDefectCode(j);
                  break;
               }
            }
         }
         //   for(j = 0; j < nArrayCount; j++)
         //   {
         //      strTemp = strArrayOption.GetAt(j);
         //      if(strTemp.Compare(strItemText) == 0)
         //      {
         //         //pRcpPriorityInfo->SetPriorityOpticData(j);//20210608
         //         pRcpPriorityInfo->SetPriorityDefectCode(j);
         //         break;
         //      }
         //   }
         //}

         //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD START
         strItemText.Format(_T("%s"), m_ctrlGridFilterinfo.GetItemText(nRowIdx, nColIdx++));
         pRcpPriorityInfo->SetPriorityDefectCode(strItemText);
         //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD END

         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         if(pCellCombo)
@@ -786,25 +802,30 @@
         CRcpPriorityInfo* pRcpPriorityInfo = pRsRcpReviewInfo->GetRcpPriorityInfo(i);      
         if(pRcpPriorityInfo == NULL) continue;

         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         if(pCellCombo)
         {
            strArrayOption.RemoveAll();
            strItemText = pCellCombo->GetText();
            pCellCombo->GetOptions(strArrayOption);
            nArrayCount = (int)strArrayOption.GetCount();
         //pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         //if(pCellCombo)
         //{
         //   strArrayOption.RemoveAll();
         //   strItemText = pCellCombo->GetText();
         //   pCellCombo->GetOptions(strArrayOption);
         //   nArrayCount = (int)strArrayOption.GetCount();

            for(j = 0; j < nArrayCount; j++)
            {
               strTemp = strArrayOption.GetAt(j);
               if(strTemp.Compare(strItemText) == 0)
               {
                  //pRcpPriorityInfo->SetPriorityOpticData(j); //20210608
                  pRcpPriorityInfo->SetPriorityDefectCode(j);
                  break;
               }
            }
         }
         //   for(j = 0; j < nArrayCount; j++)
         //   {
         //      strTemp = strArrayOption.GetAt(j);
         //      if(strTemp.Compare(strItemText) == 0)
         //      {
         //         //pRcpPriorityInfo->SetPriorityOpticData(j); //20210608
         //         pRcpPriorityInfo->SetPriorityDefectCode(j);
         //         break;
         //      }
         //   }
         //}

         //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD START
         strItemText.Format(_T("%s"), m_ctrlGridFilterinfo.GetItemText(nRowIdx, nColIdx++));
         pRcpPriorityInfo->SetPriorityDefectCode(strItemText);
         //LYW #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 MOD END

         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         if(pCellCombo)
@@ -1406,41 +1427,43 @@
            }
            strArrayOption.Add(strTemp);
         }*/
         for (j = 0; j < RCP_PRIORITY_DEFECTCODE_COUNT; j++)//20210608
         {
            switch (j)
            {
            case RCP_PRIORITY_DEFECT_CODE_ALL:
               strTemp.Format(_T("ALL"));
               break;
            case RCP_PRIORITY_DEFECT_CODE_TRDF:
               strTemp.Format(_T("TRDF"));
               break;
            case RCP_PRIORITY_DEFECT_CODE_BATR:
               strTemp.Format(_T("BATR"));
               break;
            case RCP_PRIORITY_DEFECT_CODE_DOBB:
               strTemp.Format(_T("DOBB"));
               break;
            case RCP_PRIORITY_DEFECT_CODE_DOBS:
               strTemp.Format(_T("DOBS"));
               break;
            case RCP_PRIORITY_DEFECT_CODE_DOWW:
               strTemp.Format(_T("DOWW"));
               break;
            case RCP_PRIORITY_DEFECT_CODE_DOWB:
               strTemp.Format(_T("DOWB"));
               break;
            case RCP_PRIORITY_DEFECT_CODE_DOWS:
               strTemp.Format(_T("DOWS"));
               break;
            }
            strArrayOption.Add(strTemp);
         }
         m_ctrlGridFilterinfo.SetCellType(nRowIdx, nColIdx, RUNTIME_CLASS(CGridCellCombo));
         pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         pCellCombo->SetOptions(strArrayOption);
         pCellCombo->SetStyle(CBS_DROPDOWN);
         //for (j = 0; j < RCP_PRIORITY_DEFECTCODE_COUNT; j++)//20210608
         //{
         //   switch (j)
         //   {
         //   case RCP_PRIORITY_DEFECT_CODE_ALL:
         //      strTemp.Format(_T("ALL"));
         //      break;
         //   case RCP_PRIORITY_DEFECT_CODE_TRDF:
         //      strTemp.Format(_T("TRDF"));
         //      break;
         //   case RCP_PRIORITY_DEFECT_CODE_BATR:
         //      strTemp.Format(_T("BATR"));
         //      break;
         //   case RCP_PRIORITY_DEFECT_CODE_DOBB:
         //      strTemp.Format(_T("DOBB"));
         //      break;
         //   case RCP_PRIORITY_DEFECT_CODE_DOBS:
         //      strTemp.Format(_T("DOBS"));
         //      break;
         //   case RCP_PRIORITY_DEFECT_CODE_DOWW:
         //      strTemp.Format(_T("DOWW"));
         //      break;
         //   case RCP_PRIORITY_DEFECT_CODE_DOWB:
         //      strTemp.Format(_T("DOWB"));
         //      break;
         //   case RCP_PRIORITY_DEFECT_CODE_DOWS:
         //      strTemp.Format(_T("DOWS"));
         //      break;
         //   }
         //   strArrayOption.Add(strTemp);
         //}
         //m_ctrlGridFilterinfo.SetCellType(nRowIdx, nColIdx, RUNTIME_CLASS(CGridCellCombo));
         //pCellCombo = (CGridCellCombo*)m_ctrlGridFilterinfo.GetCell(nRowIdx, nColIdx++);
         //pCellCombo->SetOptions(strArrayOption);
         //pCellCombo->SetStyle(CBS_DROPDOWN);

         nColIdx++;

         strArrayOption.RemoveAll();
         for (j = 0; j < RCP_PRIORITY_GRADE_COUNT; j++)