From 6c48319c60c4eb6ad4ff3631f5caa6b297d2e787 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 18 8월 2021 09:06:18 +0900
Subject: [PATCH] Merge branch 'feature/#3561_CF_AOI_Review_Align_카메라_끊김_현상_조치' into feature/#3562_CF_AOI_Review_실행_프로그램_경로_변경
---
ReviewSystem/ReviewSystem/SequenceProcessor.h | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor.h b/ReviewSystem/ReviewSystem/SequenceProcessor.h
index 5cebbf0..afe2621 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor.h
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor.h
@@ -484,6 +484,13 @@
virtual CDlgSelfDiagnosis* ISP2P_GetDlgDiagnosis() = 0;
virtual CDlgReviewHistoryTool* ISP2P_GetDlgHistory() = 0;
+ virtual BOOL ISP2P_GetFirstReviewLeft() = 0;
+ virtual BOOL ISP2P_GetFirstReviewRight() = 0;
+ virtual void ISP2P_SetFirstReviewLeft(BOOL b_Check) = 0;
+ virtual void ISP2P_SetFirstReviewRight(BOOL b_Check) = 0;
+
+
+
virtual BOOL GetOffSetValue(int nModule, int nCam, int nScan, double dGlassXPos, double &dXpos, double &dYpos) = 0;
public:
@@ -525,7 +532,10 @@
virtual BOOL SendSignalOffToSignalControl(int nSignalIndex, int nSignalValue) = 0;
virtual BOOL SendSignalReviewAlive(long alive);
- virtual void MakeDVData2() = 0; //210325 kyh
+
+ //#3358 KYH FDC �뜲�씠�꽣 �쟾�넚 �떆�젏 媛쒖꽑 ADD START
+ virtual void MakeDVData2() = 0;
+ //#3358 KYH FDC �뜲�씠�꽣 �쟾�넚 �떆�젏 媛쒖꽑 ADD END
virtual BOOL CalculateReviewPathPlan(CDefectPicker* pDefectPicker, CGlassResult *pGlassResult) {return TRUE;}
virtual BOOL CalculateReviewPathPlan(CDefectPicker* pDefectPicker, CGlassResult *pGlassResult, int nPlanIdx) {return TRUE; }
@@ -577,10 +587,16 @@
void SetSP2P(ISequenceProcessor2Parent* pSP2P);
void SetLineMachineType(int nLineType, int nMachineType, CString strEqpID);
void SetDefaultValue();
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ void SetSimulationMode(BOOL bCheck) { m_bSimulationMode = bCheck; };
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
// getter
int GetProcessMode() const;
int GetProcessStatus() const;
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ BOOL GetSimulationMode() { return m_bSimulationMode; };
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
static int GetDirectionX(int nGlassDirection, int nMotorDirection);
static int GetDirectionY(int nGlassDirection, int nMotorDirection);
@@ -604,6 +620,8 @@
// Review, WSI Stop Siganl
BOOL SetMotionStop();
+ // Align Camera Control command
+ BOOL AlignCamera_CameraControl(int nControlCmd);
protected:
// common
@@ -615,9 +633,6 @@
// PCControl Control command
BOOL Signal_SendSignal(int nSignalIndex);
BOOL PCControl_ReadTransferData(STransferData* pTransferData);
-
- // Align Camera Control command
- BOOL AlignCamera_CameraControl(int nControlCmd);
// Review Camera Control Command
void ReviewCamera_CameraControl(int nControlCmd);
@@ -770,4 +785,8 @@
CTime m_wsiStartTime;
int m_nWsiTotalCount;
+
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ BOOL m_bSimulationMode;
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
};
\ No newline at end of file
--
Gitblit v1.9.3