From f77e8008cac062596058fca2aeddda62b80bedbf Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 14 7월 2023 17:03:10 +0900
Subject: [PATCH] Merge branch 'feature/#4517_CF_AOI_Review_결과_파일_찾기_실패_개선' into develop
---
ReviewSystem/ReviewSystem/SequenceProcessor.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor.h b/ReviewSystem/ReviewSystem/SequenceProcessor.h
index 5cebbf0..d3dfc9c 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor.h
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor.h
@@ -370,6 +370,9 @@
virtual void ISP2P_SetCurrentWsiMode(int nMode) = 0;
+ //#3561 210908 LYW ADD Start
+ virtual void ISP2P_InitAlignCamera() = 0;
+ //#3561 210908 LYW ADD End
// system info
virtual const CSystemInfo* ISP2P_System_GetSystemInfo() = 0;
@@ -426,6 +429,22 @@
virtual CGlassResult* ISP2P_GetGlassResult(int nIndex) = 0; // get glass result
virtual CGlassResult* ISP2P_GetCurrentGlassResult() = 0; // get current glass result
virtual STransferData* ISP2P_GetCurrentTransferData() = 0; // get current transfer data
+
+ //Review Contrast
+ /*< LYW 20211109 - #3662 ADD Start >*/
+ virtual BOOL ISP2P_GetReview00ImageContrast() = 0;
+ virtual BOOL ISP2P_GetReview01ImageContrast() = 0;
+ virtual void ISP2P_SetReview00ImageContrast(int n_Value) = 0;
+ virtual void ISP2P_SetReview01ImageContrast(int n_Value) = 0;
+ /*< LYW 20211109 - #3662 ADD End >*/
+
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ virtual BOOL ISP2P_GetReviewSWVersion() = 0;
+ virtual BOOL ISP2P_GetSyncSWVersion() = 0;
+ virtual BOOL ISP2P_GetGRMSWVersion() = 0;
+ virtual BOOL ISP2P_GetFTPUploaderSWVersion() = 0;
+ virtual BOOL ISP2P_GetWSISWVersion(int nModuleIndex) = 0;
+ /*< LYW 20220415 - #4086 ADD End >*/
virtual CGlassResult* ISP2P_GetNewHistoryResult(int& nHistoryResultCount) = 0; // new glass result
virtual CGlassResult* ISP2P_GetHistoryResult(int nIndex) = 0; // get glass result
@@ -484,6 +503,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 +551,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 +606,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 +639,8 @@
// Review, WSI Stop Siganl
BOOL SetMotionStop();
+ // Align Camera Control command
+ BOOL AlignCamera_CameraControl(int nControlCmd);
protected:
// common
@@ -615,9 +652,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);
@@ -714,6 +748,8 @@
//WSI END 泥댄겕瑜� �쐞�븳 �븿�닔 190725 chm
int GetCheckWSIEnd(){return m_nCheckWSIEnd;}; // wsi end �뿬遺�
void SetCheckWSIEnd(int nCheck){ m_nCheckWSIEnd=nCheck;}; //wsi end �뿬遺�
+ int GetReviewComplete() { return m_bReviewComplete; }
+ void SetReviewComplete(BOOL bValue) { m_bReviewComplete = bValue; }
int GetWsiType(){return m_nWsiTyep;};
void SetWsiType(int i){ m_nWsiTyep=i;};
void SendWsiErrorAlarm();
@@ -728,6 +764,7 @@
virtual void SetEndTickCount(DWORD dwTick) = 0;
virtual DWORD GetStartTickCount() = 0;
virtual DWORD GetEndTickCount() = 0;
+ virtual void sendUploadResult2SequenceProcessor(int UploadResult) = 0;
protected:
int m_nCheckWSIEnd;
@@ -770,4 +807,9 @@
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
+ BOOL m_bReviewComplete;
};
\ No newline at end of file
--
Gitblit v1.9.3