From 344c17c8fcceea4c72e26ef1b4b9a11abfd0f3c4 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 11 11월 2021 17:57:01 +0900
Subject: [PATCH] Merge branch 'feature/#3766_CF_AOI_Review_전설비_설정한_기준치_이상_Offset_적용시_경고_기능_추가' into feature/#3662_CF_AOI_Review_전설비_알람_발생_조치
---
ReviewSystem/ReviewSystem/MainFrm.cpp | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/MainFrm.cpp b/ReviewSystem/ReviewSystem/MainFrm.cpp
index 2f49cd1..b1a2b0f 100644
--- a/ReviewSystem/ReviewSystem/MainFrm.cpp
+++ b/ReviewSystem/ReviewSystem/MainFrm.cpp
@@ -41,6 +41,8 @@
ID_INDICATOR_SCRL,
};
+// �젙�쓽
+
// CMainFrame �깮�꽦/�냼硫�
CMainFrame::CMainFrame()
@@ -68,6 +70,8 @@
if (CFrameWndEx::OnCreate(lpCreateStruct) == -1)
return -1;
+ SetUnhandledExceptionFilter(TopLevelExceptionFilterCallBack);
+
ModifyStyle(WS_CAPTION, NULL);
SetMenu(NULL);
@@ -83,6 +87,16 @@
//SetTimer(ID_TIMER_WSI_START_ACK_TIME, 100, NULL);
SetTimer(ID_TIMER_SEND_SIGNAL_ALIVE, 100, NULL);
+
+ //LYW Align Reconnect
+ //�뾽�뜲�씠�듃�떆
+ system("netsh interface set interface name = \"Align #1\" admin = disable"
+ "&& netsh interface set interface name = \"Align #1\" admin = enable"
+ "&& netsh interface set interface name = \"Align #2\" admin = disable"
+ "&& netsh interface set interface name = \"Align #2\" admin = enable"
+ "&& net use Y : \\\\126.100.100.1\\d\\DIT_ResultData pw : dit / user : Server / persistent : yes");
+
+ Sleep(2000);
// SetTimer(ID_TIMER_WSI_LONGRUN_TEST_TIME, 10000, NULL);
@@ -334,7 +348,10 @@
if (pSequenceProcessor == NULL) return;
pSequenceProcessor->SendSignalReviewAlive((long)m_bAlive);
+
+ //#3358 KYH FDC �뜲�씠�꽣 �쟾�넚 �떆�젏 媛쒖꽑 ADD START
pSequenceProcessor->MakeDVData2(); // 210325 kyh
+ //#3358 KYH FDC �뜲�씠�꽣 �쟾�넚 �떆�젏 媛쒖꽑 ADD END
}
void CMainFrame::SendAFMAlive()
{
@@ -437,9 +454,9 @@
#define strScript "RESTART^AFControl.exe^C:\\AFControl\\program\\AFControl.exe"
CFile file;
- if( FALSE == file.Open(_T("C:\\DIT_Review\\MakeScript.TSF"),CFile::modeCreate | CFile::modeWrite) )
+ if( FALSE == file.Open(_T("D:\\DIT_Review\\MakeScript.TSF"),CFile::modeCreate | CFile::modeWrite) ) //210805
{
- g_pLog->DisplayMessage(_T("File[C:\\DIT_Review\\MakeScript.TSF] Create Fail!!"));
+ g_pLog->DisplayMessage(_T("File[D:\\DIT_Review\\MakeScript.TSF] Create Fail!!")); //210805
return;
}
@@ -471,7 +488,7 @@
CString strTarget;
strTarget.Format(_T("\\\\126.100.100.220\\c\\RemoteTaskMgr\\T\\CopyScript.TSF"));
- BOOL bRet = CopyFile(_T("C:\\DIT_Review\\MakeScript.TSF"),strTarget,FALSE);
+ BOOL bRet = CopyFile(_T("D:\\DIT_Review\\MakeScript.TSF"),strTarget,FALSE); //210805
if(bRet == FALSE)
g_pLog->DisplayMessage(_T("[%s]Send Script Fail!"), strTarget);
/////////////////////////////////////
@@ -871,6 +888,14 @@
if (pCopyData) OnCopyDataAoiServer(pCopyData);
}
break;
+
+ case COPYDATA_REVIEWHISTORYOR2REVIEWSYSTEM:
+ {
+ DlgReviewOffSetTool* pReviewOffSetTool = m_pView->GetReviewOffSetToolHandle();
+ pReviewOffSetTool->PostMessage(WM_OFFSETTOOL_MESSAGE, 0, 200);
+
+ }
+ break;
}
return __super::OnCopyData(pWnd, pCopyDataStruct);
@@ -930,4 +955,5 @@
return TRUE;
}
return FALSE;
-}
\ No newline at end of file
+}
+
--
Gitblit v1.9.3