From 36353af02a1c42ba4d68de5a81c63837396a9500 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 16 6월 2021 17:27:21 +0900
Subject: [PATCH] Merge branch 'feature/#3428_CF_AOI_Review_Recipe_Editor_리뷰_우선순위_조건_타입_변경기능_적용_및_검증' into feature/#3440_CF_AOI_Review_QD,_CS_Align_Cam_Reverse_X_제어_기능_추가
---
ReviewSystem/ReviewRecipeEditor/DlgReview.cpp | 184 +++++++++++++++++++++++++--------------------
1 files changed, 103 insertions(+), 81 deletions(-)
diff --git a/ReviewSystem/ReviewRecipeEditor/DlgReview.cpp b/ReviewSystem/ReviewRecipeEditor/DlgReview.cpp
index ab0c062..bc0f3dc 100644
--- a/ReviewSystem/ReviewRecipeEditor/DlgReview.cpp
+++ b/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);
@@ -357,19 +362,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 +682,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 +801,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 +1426,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++)
--
Gitblit v1.9.3