From c08fcb0ca69c8893d64504e082608ad8fb82eb40 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 월, 25 10월 2021 08:58:31 +0900
Subject: [PATCH] 프로그램 시작시 백업 기능 삭제(네트워크 딜레이로 인한 프로그램 지연)
---
ReviewSystem/ReviewSystem/ReviewInterface.cpp | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index a933e74..35f28a1 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -127,6 +127,10 @@
m_bFirstReviewLeft = 0;
m_bFirstReviewRight = 0;
+ /*< LYW 20211014 - #3671 ADD Start >*/
+ m_daccumulate = 0;
+ /*< LYW 20211014 - #3671 ADD End >*/
+
// cs init
InitializeCriticalSection(&m_csReviewResult);
InitializeCriticalSection(&m_csReviewSignal);
@@ -151,8 +155,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();
@@ -1272,7 +1276,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
{
@@ -3113,6 +3117,16 @@
BOOL CReviewInterface::IACC2P_GetLightLevel(int nCameraIndex, int& nValue)
{
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)
@@ -5772,6 +5786,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
@@ -6533,6 +6553,7 @@
m_pDlgDiagnosis->ShowWindow(SW_SHOW);
+ return;
/*
if (m_pSignalControl)
{
@@ -6550,6 +6571,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);
@@ -8930,6 +8959,11 @@
SetCurrentWsiMode(nMode);
}
+void CReviewInterface::ISP2P_InitAlignCamera()
+{
+ InitAlignCamera();
+}
+
int CReviewInterface::IWC2P_GetWsiType()
{
return GetCurrentWsiMode();
--
Gitblit v1.9.3