From c08b701c90c8998b241c82638d5c488e03238214 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 23 9월 2021 17:39:47 +0900
Subject: [PATCH] Ongoing100 #3517 CF AOI Review 자가진단 기능 개선
---
ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Squareness.cpp | 4
ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Wsi.cpp | 4
ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Flatness.cpp | 8 +-
ReviewSystem/ReviewSystem/ReviewInterface.cpp | 13 +---
ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 5 -
ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp | 24 ++++----
ReviewSystem/M_AutoDiagnosisManager/DiagnosisInfo.cpp | 4
ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp | 32 +++++-----
ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h | 24 ++++----
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 6 -
10 files changed, 56 insertions(+), 68 deletions(-)
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisInfo.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisInfo.cpp
index 3f0ef85..13368bc 100644
--- a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisInfo.cpp
+++ b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisInfo.cpp
@@ -19,12 +19,12 @@
file.GetItem(_T("FLATNESS_JUDGE_DATA_Z_RANGE"), m_dJudgeData_ZRange, 0);
file.GetItem(_T("FLATNESS_GLASS_X"), m_nGlassSizeX, 0);
file.GetItem(_T("FLATNESS_GLASS_Y"), m_nGlassSizeY, 0);
- //#3514_LYW_CF AOI Review 자가진단 기능 개선_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
file.GetItem(_T("FLATNESS_SKIPMODE"), m_nFlatnessSkipMode, 0);
file.GetItem(_T("SQUARENESS_STANDARD"), m_dSquarenessStandard, 0);
file.GetItem(_T("SQUARENESS_STANDARD2"), m_dSquarenessStandard2, 0);
file.GetItem(_T("WSI_STANDARD"), m_dWSIStandard, 0);
- //#3514_LYW_CF AOI Review 자가진단 기능 개선_END
+ /*< LYW 20210719 : #3517 ADD End >*/
file.GetItem(_T("FLATNESS_MODE"), m_nFlatnessMode, 0);
file.GetItem(_T("FLATNESS_RANGECOUNT"), m_nRangeCount_Flatness, 0);
file.GetItem(_T("WSI_PANEL_COUNT"), m_nPanelCount_Wsi, 0);
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
index de39519..5670280 100644
--- a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
+++ b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
@@ -62,7 +62,7 @@
m_pManager->m_bProcessAll = true;
ProcessAll();
break;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
case DiagnosisMode_Review :
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisMode_Review START"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
@@ -116,7 +116,7 @@
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
break;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
case DiagnosisMode_Flatness:
m_pManager->m_bProcessAll = false;
ProcessFlatness();
@@ -167,7 +167,7 @@
m_pDP2P->IDP2P_SetDialogTap(1);
ProcessFlatness();
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(2000);
Sleep(1000);
@@ -175,7 +175,7 @@
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisJudge FAIL"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
m_pManager->m_bProcessAll = false;
@@ -300,9 +300,9 @@
int stTime = GetTickCount();
while (1)
{
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//if (11000 <= GetTickCount() - stTime)
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
if (1500 <= GetTickCount() - stTime)
{
break;
@@ -311,10 +311,10 @@
}
m_pDP2P->IDP2P_SetAFMTracking(nSelModuleIndex, TRUE);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(1000);
Sleep(1000);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
CString strimagename;
strimagename.Format(_T("%s_Module[%d]Index[%d].bmp"), m_pManager->m_strResultImageFileName, nSelModuleIndex, nIdx);
@@ -462,10 +462,10 @@
}
m_pDP2P->IDP2P_SetWsiManualMeasure(nSelModuleIndex, dXpos, dYpos);
// move panel
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(2000);
Sleep(1000);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
m_pDP2P->IDP2P_MotorGo(nSelModuleIndex, dXpos, dYpos);
if (m_pDP2P->IDP2P_IsGantryMotionEnd(nSelModuleIndex) == FALSE)
@@ -477,10 +477,10 @@
int stTime = GetTickCount();
while (1)
{
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//if (10000 <= GetTickCount() - stTime)
if (11000 <= GetTickCount() - stTime)
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
{
break;
}
@@ -545,14 +545,14 @@
CDiagnosisInfo * pSettingInfo = m_pManager->GetDiagnosisInfo();
if (pSettingInfo == NULL) return 0;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
if (pSettingInfo->GetFlastnessSkipMode() == TRUE) {
strMessage.Format(_T("[CDiagnosisProcessor] FlastnessSkipMode!"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
return 0;
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
int nSelModuleIndex = m_pDP2P->IDP2P_GetSelectedModuleIndex();
int nFlatnessMode = pSettingInfo->GetFlatnessMode();
@@ -593,10 +593,10 @@
{
// AF Home
m_pDP2P->IDP2P_AFMHomePosition(0);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(5000);
Sleep(1000);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
m_pDP2P->IDP2P_SetAFMTracking(0, TRUE);
Sleep(500);
}
diff --git a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Flatness.cpp b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Flatness.cpp
index d978c31..2fefe20 100644
--- a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Flatness.cpp
+++ b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Flatness.cpp
@@ -983,7 +983,7 @@
{
// TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
if (m_pDiagnosisManager->CheckManualMode() == FALSE)
{
CString strMessage;
@@ -994,7 +994,7 @@
return;
}
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
if (m_bState == FALSE)
{
@@ -1013,7 +1013,7 @@
void CDlgSelfDiagnosis_Flatness::OnBnClickedButtonManual()
{
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
if (m_pDiagnosisManager->CheckManualMode() == FALSE)
{
CString strMessage;
@@ -1024,7 +1024,7 @@
return;
}
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
m_pDiagnosisManager->ManualMeasure_Flatness();
}
diff --git a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp
index df5dc06..21afd3d 100644
--- a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp
+++ b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp
@@ -56,12 +56,12 @@
DDX_Control(pDX, IDC_EDIT_WSI_PANEL_POS_Y, m_editPanelPosY);
DDX_Control(pDX, IDC_EDIT_WSI_PANEL_POS_X2, m_editPanelPosX2);
DDX_Control(pDX, IDC_EDIT_WSI_PANEL_POS_Y2, m_editPanelPosY2);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
DDX_Control(pDX, IDC_CHECK_SELF_DIAGNOSIS_FLATNESS_SKIP, m_CheckFlatnessSkip);
DDX_Control(pDX, IDC_EDIT_SQUARENESS_STANDARD, m_editSquarenessStandard);
DDX_Control(pDX, IDC_EDIT_SQUARENESS_STANDARD2, m_editSquarenessStandard2);
DDX_Control(pDX, IDC_EDIT_WSI_STANDARD, m_editWSIStandard);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
DDX_Text(pDX, IDC_EDIT_REVIEW_PANEL_POS_X, m_dEditReviewPanelPosX);
DDX_Text(pDX, IDC_EDIT_REVIEW_PANEL_POS_Y, m_dEditReviewPanelPosY);
DDX_Text(pDX, IDC_EDIT_REVIEW_PANEL_POS_X2, m_dEditReviewPanelPosX2);
@@ -117,11 +117,11 @@
BOOL CDlgSelfDiagnosis_Setting::ReadAutoDiagnosisConfigFile()
{
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
CString strConfigFilePath = _T("");
strConfigFilePath.Format(_T("%s\\%s"), REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_PATH, REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_NAME);
m_pDiagnosisManager->LoadSettingConfigFile(strConfigFilePath);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
CDiagnosisInfo* pSettingInfo = m_pDiagnosisManager->GetDiagnosisInfo();
if (pSettingInfo == NULL)
@@ -143,13 +143,13 @@
strTemp.Format("%f", pSettingInfo->GetJudgeData_Degree());
m_editJudgeData_Degree.SetWindowTextA(strTemp);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
strTemp.Format("%f", pSettingInfo->GetSquarenessStandard());
m_editSquarenessStandard.SetWindowTextA(strTemp);
strTemp.Format("%f", pSettingInfo->GetSquarenessStandard2());
m_editSquarenessStandard2.SetWindowTextA(strTemp);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
strTemp.Format("%d", pSettingInfo->GetCameraFrameWidth());
m_editFrameWidth.SetWindowTextA(strTemp);
@@ -183,9 +183,9 @@
strTemp.Format("%d", pSettingInfo->GetGlassSizeY_Flatness());
m_editGlassSizeY.SetWindowTextA(strTemp);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
m_CheckFlatnessSkip.SetCheck(pSettingInfo->GetFlastnessSkipMode());
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
strTemp.Format("%d", pSettingInfo->GetPanelCount_Wsi());
m_editPanelCount_Wsi.SetWindowTextA(strTemp);
@@ -193,10 +193,10 @@
strTemp.Format("%f", pSettingInfo->GetJudgeData_3Sigma());
m_editJudgeData_3Sigma.SetWindowTextA(strTemp);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
strTemp.Format("%f", pSettingInfo->GetWSIStandard());
m_editWSIStandard.SetWindowTextA(strTemp);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
strTemp.Format("%f", pSettingInfo->GetPanelPosX_Wsi());
m_editPanelPosX.SetWindowTextA(strTemp);
@@ -303,7 +303,7 @@
nTemp = atoi(strTemp);
macroFile.SetItem(strItem, nTemp);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
strItem.Format(_T("FLATNESS_SKIPMODE"));
nTemp = m_CheckFlatnessSkip.GetCheck();
macroFile.SetItem(strItem, nTemp);
@@ -323,7 +323,7 @@
dTemp = atof(strTemp);
macroFile.SetItem(strItem, dTemp);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
strItem.Format(_T("WSI_PANEL_COUNT"));
m_editPanelCount_Wsi.GetWindowTextA(strTemp);
diff --git a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Squareness.cpp b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Squareness.cpp
index 977e28c..1c7c651 100644
--- a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Squareness.cpp
+++ b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Squareness.cpp
@@ -552,7 +552,7 @@
if (m_pDiagnosisManager == NULL) return;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
if (m_pDiagnosisManager->CheckManualMode() == FALSE)
{
CString strMessage;
@@ -563,7 +563,7 @@
return;
}
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
GetDialogControls();
diff --git a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Wsi.cpp b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Wsi.cpp
index 2940785..ae43415 100644
--- a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Wsi.cpp
+++ b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Wsi.cpp
@@ -68,7 +68,7 @@
if (m_pDiagnosisManager == NULL) return;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
if (m_pDiagnosisManager->CheckManualMode() == FALSE)
{
CString strMessage;
@@ -79,7 +79,7 @@
return;
}
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
//GetDialogControls();
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index af66be2..7e3e007 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -6525,6 +6525,10 @@
{
if (m_pSequenceProcessor==NULL) return;
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ m_pSequenceProcessor->SetSimulationMode(TRUE);
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
+
if (nCommand == -1) // DBClick Date
{
@@ -6533,7 +6537,6 @@
m_pDlgDiagnosis->ShowWindow(SW_SHOW);
- return;
/*
if (m_pSignalControl)
{
@@ -6551,14 +6554,6 @@
{
g_pLog->DisplayMessage(_T("Machine Mode is not Manual or Review Mode!"));
return;
- }
-
- else
- {
- //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
- m_pSequenceProcessor->SetSimulationMode(TRUE);
- g_pLog->DisplayMessage(_T("SetUserCommand = %d"), nCommand);
- //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
}
m_pSequenceProcessor->RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, nCommand);
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index d622bf0..7753de9 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -3838,11 +3838,6 @@
}
dFocus = dSum / double(nCalWidth*nCalHeight);
- //FDC 보고 MAX 수치 10
- if (dFocus >= 10.0) dFocus = 10.0;
- //FDC 보고 정수만 사용 가능 하나 2.8 수치까지 디포커스로 볼 수 없어 보정치 추가
- else dFocus += 0.2;
-
return dFocus;
//#3524_210902_LYW_MOD END
//Origin
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index a795da2..fd16d92 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -8619,7 +8619,6 @@
case PCControlRecv_AutoMode_CPJT: // auto mode on
{
m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Mode] Auto Mode"));
- SetSimulationMode(FALSE);
bResult = SetProcessMode(ProcessAutoMode_CPJT);
if (bResult==FALSE) m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Mode] Auto Mode Error!"));
}
@@ -8823,12 +8822,11 @@
break;
case PCControlRecv_Autodiagnosis:
{
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
CSignalControl* pSignalControl = m_pSP2P->ISP2P_GetSignalControl();
CString strDiagnosisMode;
pSignalControl->ReadData(_T("11160"), 2, strDiagnosisMode);
int nDiagnosisMode = atoi(strDiagnosisMode);
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Signal] Diagno start => %d, DiagnosisMode => %d"), bSignalOn, nDiagnosisMode);
if (bSignalOn) {
@@ -8838,7 +8836,7 @@
m_pSP2P->ISP2P_GetDiagnosisManager()->RecvSignalToSignalControl(0, nDiagnosisMode);
}
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
else
bResult = SendSignalOffToSignalControl(PCControlSendSignalIndex_DiagnoAck, 0);
diff --git a/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h b/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
index 3ec6aef..08f5ec5 100644
--- a/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
+++ b/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
@@ -225,9 +225,9 @@
m_dReviewPanelPosY2 = 0;
m_dReviewPanelPosX4 = 0;
m_dReviewPanelPosY4 = 0;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
m_nFlatnessSkipMode = 0;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
}
@@ -254,12 +254,12 @@
void SetPanelPosY_Wsi(double dData) { m_dPanelPosY = dData; }
void SetPanelPosX2_Wsi(double dData) { m_dPanelPosX2 = dData; }
void SetPanelPosY2_Wsi(double dData) { m_dPanelPosY2 = dData; }
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
void SetFlastnessSkipMode(double dData) { m_nFlatnessSkipMode = dData; }
void SetSquarenessStandard(double dData) { m_dSquarenessStandard = dData; }
void SetSquarenessStandard2(double dData) { m_dSquarenessStandard2 = dData; }
void SetWSIStandard(double dData) { m_dWSIStandard = dData; }
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
// getter
@@ -291,12 +291,12 @@
double GetPanelPosY_Wsi() const { return m_dPanelPosY; }
double GetPanelPosX2_Wsi() const { return m_dPanelPosX2; }
double GetPanelPosY2_Wsi() const { return m_dPanelPosY2; }
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
int GetFlastnessSkipMode() const { return m_nFlatnessSkipMode; }
double GetSquarenessStandard() const { return m_dSquarenessStandard; }
double GetSquarenessStandard2() const { return m_dSquarenessStandard2; }
double GetWSIStandard() const { return m_dWSIStandard; }
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
//Review
public:
double GetReviewPanelPosX() const { return m_dReviewPanelPosX; }
@@ -325,10 +325,10 @@
int m_nCameraFrameHeight;
double m_dCameraResolution;
double m_dJudgeData_Degree;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
double m_dSquarenessStandard;
double m_dSquarenessStandard2;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
// Flatness
CDiagnosisResult m_dataSettingResult_Flatness; // single data
@@ -338,17 +338,17 @@
int m_nRangeCount_Flatness;
int m_nGlassSizeX;
int m_nGlassSizeY;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
int m_nFlatnessSkipMode;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
// wsi
VectorDiagnosisResult m_vecSettingResult_Wsi; // add module count
int m_nPanelCount_Wsi;
double m_dJudgeData_3Sigma;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
double m_dWSIStandard;
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
double m_dPanelPosX;
double m_dPanelPosY;
--
Gitblit v1.9.3