From 9ad2aa59da822e9d30c5e0cd677025fe6e12df95 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 09 11월 2021 17:37:17 +0900
Subject: [PATCH] Ongoing90 #3662 CF AOI Review 전설비 알람 발생 조치
---
ReviewSystem/ReviewSystem/ReviewInterface.cpp | 145 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 137 insertions(+), 8 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index 313cec6..cdc9778 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -124,6 +124,17 @@
m_bIsOffSetOn = 0;
m_bIsSimulation = 0;
+ m_bFirstReviewLeft = 0;
+ m_bFirstReviewRight = 0;
+
+ /*< LYW 20211014 - #3671 ADD Start >*/
+ m_daccumulate = 0;
+ /*< LYW 20211014 - #3671 ADD End >*/
+ /*< LYW 20211109 - #3662 ADD Start >*/
+ m_nReview00ImageContrast = 5;
+ m_nReview01ImageContrast = 5;
+ /*< LYW 20211109 - #3662 ADD End >*/
+
// cs init
InitializeCriticalSection(&m_csReviewResult);
InitializeCriticalSection(&m_csReviewSignal);
@@ -148,8 +159,8 @@
//�떆�옉�븷�븣 �떎 吏��슦怨� �떎�떆 蹂듭궗媛� �븘�슂�븷吏�
//std::experimental::filesystem::remove_all(_REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT);
//std::experimental::filesystem::remove_all(_REVIEW_RECIPE_BACKUP_PATH_CPJT);
- ISP2P_CopyFolder(_REVIEW_SERVER_CONFIG_PATH_, _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT);
- ISP2P_CopyFolder(_REVIEW_RECIPE_PATH_, _REVIEW_RECIPE_BACKUP_PATH_CPJT);
+ //ISP2P_CopyFolder(_REVIEW_SERVER_CONFIG_PATH_, _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT);
+ //ISP2P_CopyFolder(_REVIEW_RECIPE_PATH_, _REVIEW_RECIPE_BACKUP_PATH_CPJT);
//LYW_#3344_CF AOI Review Config File 諛깆뾽 湲곕뒫 媛쒖꽑 ADD END
SetProgramVersion();
@@ -1269,7 +1280,7 @@
// process status observer
AddObserverUpdateProcessStatus(static_cast<IUpdateProcessStatus*>(m_pAlignCameraControl));
- m_pAlignCameraControl->Camera_Control(CameraControlLive);
+ /*m_pAlignCameraControl->Camera_Control(CameraControlLive);*/ // 210805 Align Camera Sequence 蹂�寃�
}
else
{
@@ -3112,6 +3123,16 @@
return AlignLight_GetLightLevel(nCameraIndex, nValue);
}
+int CReviewInterface::IACC2P_GetAccumaulate()
+{
+ return m_daccumulate;
+}
+
+void CReviewInterface::IACC2P_SetAccumaulate(int dValue)
+{
+ m_daccumulate = dValue;
+}
+
BOOL CReviewInterface::IRCC2P_GetCurrentFrame(int nModuleIndex, int nCameraIndex, int nFrameWidth, int nFrameHeight, int nFrameChannels, CCHImageData* pImageData)
{
if (m_pVirtualGlassMap==NULL) return FALSE;
@@ -3317,6 +3338,12 @@
return m_pDoc->System_GetSystemInfo();
}
+const CSignalControlInfo* CReviewInterface::IRP2P_GetReviewSignalinfo()
+{
+ if (m_pDoc == NULL) return NULL;
+ return m_pDoc->System_GetSignalInfo();
+}
+
CGlassResult* CReviewInterface::IRP2P_GetCurrentGlassResult()
{
if (m_pDoc==NULL) return NULL;
@@ -3377,6 +3404,46 @@
CRecipeManager* CReviewInterface::IRP2P_GetEdgeRecipeManager()
{
return m_pEdgeRecipeManager;
+}
+
+BOOL CReviewInterface::IRP2P_GetFirstReviewLeft()
+{
+ return m_bFirstReviewLeft;
+}
+
+BOOL CReviewInterface::IRP2P_GetFirstReviewRight()
+{
+ return m_bFirstReviewRight;
+}
+
+void CReviewInterface::IRP2P_SetFirstReviewLeft(BOOL b_Check)
+{
+ m_bFirstReviewLeft = b_Check;
+}
+
+void CReviewInterface::IRP2P_SetFirstReviewRight(BOOL b_Check)
+{
+ m_bFirstReviewRight = b_Check;
+}
+
+BOOL CReviewInterface::IRP2P_GetReview00ImageContrast()
+{
+ return m_nReview00ImageContrast;
+}
+
+BOOL CReviewInterface::IRP2P_GetReview01ImageContrast()
+{
+ return m_nReview01ImageContrast;
+}
+
+void CReviewInterface::IRP2P_SetReview00ImageContrast(int n_Value)
+{
+ m_nReview00ImageContrast = n_Value;
+}
+
+void CReviewInterface::IRP2P_SetReview01ImageContrast(int n_Value)
+{
+ m_nReview01ImageContrast = n_Value;
}
@@ -3798,12 +3865,15 @@
if (m_SequenceProcessor == NULL) return;
m_SequenceProcessor->SetWsiType(9);
- if (!m_SequenceProcessor->WSIAllReadySignal(1))
+ if (nModuleIdx == 0)
{
- g_pLog->DisplayMessage(_T("[WSI] Send Ready Signal to All WIS Fail"));
+ if (!m_SequenceProcessor->WSIAllReadySignal(1))
+ {
+ g_pLog->DisplayMessage(_T("[WSI] Send Ready Signal to All WIS Fail"));
+ return;
+ }
}
- else
- {
+
SetCurrentWsiMode(WsiMeasureType_VLSI);
CWsiControl* pWsiControl = ISP2P_GetWSIControl(nModuleIdx);
@@ -3817,7 +3887,6 @@
pWsiControl->SetWsiStart(1, vectorPosX, vectorPosY, 0);
- }
}
void CReviewInterface::IDP2P_WsiMotorMotionEnd(int nModuleIdx, double dPosX, double dPosY)
@@ -5741,6 +5810,12 @@
pGlassResult->m_AlignRecipe.dMatchingRate = pRsRcpAlignInfo->m_dMatchingRate;
pGlassResult->m_AlignRecipe.strFirstImageFile = pRsRcpAlignInfo->m_strFirstImageFile;
pGlassResult->m_AlignRecipe.strSecondImageFile = pRsRcpAlignInfo->m_strSecondImageFile;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ pGlassResult->m_AlignRecipe.strFirstAssistantImageFile = pRsRcpAlignInfo->m_strFirstAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strSecondAssistantImageFile = pRsRcpAlignInfo->m_strSecondAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strMatchingPixelStandard = pRsRcpAlignInfo->m_strMatchingPixelStandard;
+ pGlassResult->m_AlignRecipe.strMatchingAlarmCondition = pRsRcpAlignInfo->m_strMatchingAlarmCondition;
+ /*< LYW 20211012 - #3671 ADD End >*/
pGlassResult->m_AlignRecipe.strTotalPitchImageFile = pRsRcpAlignInfo->m_strTotalPitchImageFile;
// edge find param
@@ -6502,6 +6577,7 @@
m_pDlgDiagnosis->ShowWindow(SW_SHOW);
+ return;
/*
if (m_pSignalControl)
{
@@ -6519,6 +6595,14 @@
{
g_pLog->DisplayMessage(_T("Machine Mode is not Manual or Review Mode!"));
return;
+ }
+
+ else
+ {
+ //#3584 210923 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ m_pSequenceProcessor->SetSimulationMode(TRUE);
+ g_pLog->DisplayMessage(_T("Set User Command = %d"),nCommand);
+ //#3584 210923 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
}
m_pSequenceProcessor->RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, nCommand);
@@ -8178,6 +8262,26 @@
return m_pDoc->Etc_GetTransferData();
}
+BOOL CReviewInterface::ISP2P_GetReview00ImageContrast()
+{
+ return m_nReview00ImageContrast;
+}
+
+BOOL CReviewInterface::ISP2P_GetReview01ImageContrast()
+{
+ return m_nReview01ImageContrast;
+}
+
+void CReviewInterface::ISP2P_SetReview00ImageContrast(int n_Value)
+{
+ m_nReview00ImageContrast = n_Value;
+}
+
+void CReviewInterface::ISP2P_SetReview01ImageContrast(int n_Value)
+{
+ m_nReview01ImageContrast = n_Value;
+}
+
SDefectFilter* CReviewInterface::ISP2P_GetDefectFilter()
{
if (m_pDoc==NULL) return NULL;
@@ -8377,6 +8481,26 @@
CDlgReviewHistoryTool* CReviewInterface::ISP2P_GetDlgHistory()
{
return m_pDlgHistoryTool;
+}
+
+BOOL CReviewInterface::ISP2P_GetFirstReviewLeft()
+{
+ return m_bFirstReviewLeft;
+}
+
+BOOL CReviewInterface::ISP2P_GetFirstReviewRight()
+{
+ return m_bFirstReviewRight;
+}
+
+void CReviewInterface::ISP2P_SetFirstReviewLeft(BOOL b_Check)
+{
+ m_bFirstReviewLeft = b_Check;
+}
+
+void CReviewInterface::ISP2P_SetFirstReviewRight(BOOL b_Check)
+{
+ m_bFirstReviewRight = b_Check;
}
void CReviewInterface::ILCC2P_DisplayMessage( int nIndex, const TCHAR* lpstrFormat, ... )
@@ -8879,6 +9003,11 @@
SetCurrentWsiMode(nMode);
}
+void CReviewInterface::ISP2P_InitAlignCamera()
+{
+ InitAlignCamera();
+}
+
int CReviewInterface::IWC2P_GetWsiType()
{
return GetCurrentWsiMode();
--
Gitblit v1.9.3