From 1e64f6279358f5c838463497894e020857b37311 Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 화, 21 12월 2021 09:37:24 +0900 Subject: [PATCH] Ongoing90 #3835 CF AOI Review Offset Grid 클릭시 해당 되는 결함 DefectMap표시 --- ReviewSystem/ReviewSystem/ReviewInterface.cpp | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 2 deletions(-) diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp index 6f42812..9d3b085 100644 --- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp +++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp @@ -130,6 +130,10 @@ /*< 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); @@ -155,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(); @@ -1178,6 +1182,10 @@ BOOL bConnection = pCameraControlReview->GetConnected(); pConnectionStatus->m_vecReviewCameraStatus.push_back(bConnection); + + /*< LYW 20211112 - #3708 ADD Start >*/ + g_pLog->DisplayMessage(_T("[ReviewCamera] %d is connected"), nModuleIndex); + /*< LYW 20211112 - #3708 ADD End >*/ nModuleIndex++; // module status++ } // for HeaderIdx @@ -3422,6 +3430,26 @@ 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; +} + int CReviewInterface::PS2P_GetModuleStatusCount(int nModuleType) { @@ -3477,6 +3505,14 @@ CDlgDefectMap* pDefectmap = m_pView->GetDefectMapDlgHandle(); if (pDefectmap == NULL) { return FALSE; } pDefectmap->GetDefectMap()->SetOffsetmodeparma(bMode, nCamidx, nScanidx, nXpos, nYpos); + return FALSE; +} + +BOOL CReviewInterface::IDRO2P_SetOffsetPram(int nCamIdx, int nScanIdx, BOOL bUse) +{ + CDlgDefectMap* pDefectmap = m_pView->GetDefectMapDlgHandle(); + if (pDefectmap == NULL) { return FALSE; } + pDefectmap->GetDefectMap()->SetOffsetparm(nCamIdx, nScanIdx, bUse); return FALSE; } @@ -8238,6 +8274,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; @@ -8571,6 +8627,66 @@ m_pView->ShowHistoryTool(); } +void CReviewInterface::IDL2P_OpenHWSettingTool() +{ + m_pView->ShowHWSettingMode(); +} + +BOOL CReviewInterface::IDL2P_IsManualProcessMode() +{ + return IsManualProcessMode(); +} + +int CReviewInterface::IDHM2P_InitReviewCamera() +{ + return InitReviewCamera(); +} + +void CReviewInterface::IDHM2P_DeinitReviewCamera() +{ + DeinitReviewCamera(); +} + +int CReviewInterface::IDHM2P_ConnectReviewCamera() +{ + return ConnectReviewCamera(); +} + +void CReviewInterface::IDHM2P_DisconnectReviewCamera() +{ + DisconnectReviewCamera(); +} + +void CReviewInterface::IDHM2P_ClearCameraControlObserverVector() +{ + ClearCameraControlObserverVector(); +} + +int CReviewInterface::IDHM2P_InitAFMControl() +{ + return InitAFMControl(); +} + +void CReviewInterface::IDHM2P_DeinitAFMControl() +{ + DeinitAFMControl(); +} + +int CReviewInterface::IDHM2P_InitAlignCamera() +{ + return InitAlignCamera(); +} + +void CReviewInterface::IDHM2P_DeinitAlignCamera() +{ + DeinitAlignCamera(); +} + +BOOL CReviewInterface::IDHM2P_IsManualProcessMode() +{ + return IsManualProcessMode(); +} + //181203 BOOL CReviewInterface::IRP2P_SaveDefectMap(const CString& strPath) { -- Gitblit v1.9.3