From e3ba423c2a43c03dd2cada0cffd2a0d8f8fdec80 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 26 5월 2021 18:03:38 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/#3358_FDC_데이터_전송_시점_개선' into develop
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.h | 4 +++-
ReviewSystem/ReviewSystem/SequenceProcessor.h | 5 ++++-
ReviewSystem/ReviewSystem/CameraControlAlign.cpp | 2 ++
ReviewSystem/ReviewSystem/MainFrm.cpp | 3 +++
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 7 +++++--
ReviewSystem/ReviewSystem/CameraControlAlign.h | 6 +++++-
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
index 39f2d4e..735e3f1 100644
--- a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
+++ b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
@@ -92,6 +92,7 @@
m_nAlignType = nAlignType;
}
+//#3357 KYH Align Image 珥덇린�솕 ADD START
void CCameraControlAlign::SetAlignClearImage()//210330 kyh Align �씠誘몄� 珥덇린�솕
{
//m_vecCameraImage[0]->GetImageData(View_Camera)->ClearImage(0);
@@ -106,6 +107,7 @@
m_vecCameraImage[i]->ClearImage(View_Matching);
}
}
+//#3357 KYH Align Image 珥덇린�솕 ADD END
void CCameraControlAlign::DisconnectCamera()
{
diff --git a/ReviewSystem/ReviewSystem/CameraControlAlign.h b/ReviewSystem/ReviewSystem/CameraControlAlign.h
index 345607a..911ae51 100644
--- a/ReviewSystem/ReviewSystem/CameraControlAlign.h
+++ b/ReviewSystem/ReviewSystem/CameraControlAlign.h
@@ -101,7 +101,9 @@
enum AlignViewMode { View_Camera=0, View_Result, View_Template, View_Matching };
enum AlignResult { Align_Fail=-2, Align_TempFail=-1, Align_None=0, Align_Success=1 };
+//#3357 KYH Align Image 珥덇린�솕 ADD START
enum AlignFinderType { AlignFinderType_Normal = 0, AlignFinderType_Corner, AlignFinderType_Extend, AlignFinderType_count }; //210330 kyh 異붽�
+//#3357 KYH Align Image 珥덇린�솕 ADD END
interface IAlignCameraControl2Parent
{
@@ -134,7 +136,9 @@
BOOL SaveResultImage(int nCameraIndex, const CString& strFilename);
void SetSaveImageBasePath(CString strPath);
void SetAlignType(BOOL nAlignType);
- void SetAlignClearImage(); //210330 kyh Align �씠誘몄� 珥덇린�솕
+ //#3357 KYH Align Image 珥덇린�솕 ADD START
+ void SetAlignClearImage();
+ //#3357 KYH Align Image 珥덇린�솕 ADD END
CAlignResult FindAlignMark(const VectorString& vectorFilename);
BOOL FindAlignMark(int nCameraIdx);
diff --git a/ReviewSystem/ReviewSystem/MainFrm.cpp b/ReviewSystem/ReviewSystem/MainFrm.cpp
index 1af4edc..ee342ad 100644
--- a/ReviewSystem/ReviewSystem/MainFrm.cpp
+++ b/ReviewSystem/ReviewSystem/MainFrm.cpp
@@ -341,7 +341,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()
{
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor.h b/ReviewSystem/ReviewSystem/SequenceProcessor.h
index 5cebbf0..3d8f40f 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor.h
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor.h
@@ -525,7 +525,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; }
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index aaf6ed8..62ff389 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -964,7 +964,7 @@
// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Revolver Set GoHome Success!"));
//}
- //210330 kyh Align Image 초기화
+ //#3357 KYH Align Image 초기화 ADD START
CCameraControlAlign* pAlignCameraControl = m_pSP2P->ISP2P_GetAlignCameraControl();
if (pAlignCameraControl != NULL)
{
@@ -972,6 +972,7 @@
g_pLog->DisplayMessage(_T("[Align] Align Image Clear"));
}
+ //#3357 KYH Align Image 초기화 ADD END
// get transfer data
int nResultCode = 0;
@@ -7727,7 +7728,8 @@
pSignalControl->WritePacketData(_T("15100"), sizeof(DVDataPack_CPJT), (short*)&DVData);*/
}
-void CSequenceProcessor_CPJT::MakeDVData2() //210325 kyh FDC
+//#3358 KYH FDC 데이터 전송 시점 개선 ADD START
+void CSequenceProcessor_CPJT::MakeDVData2()
{
const CRsRcpReviewInfo* pRsRcpReviewInfo = m_pSP2P->ISP2P_Recipe_GetRsRcpReviewInfo();
@@ -7990,6 +7992,7 @@
return;
}
+//#3358 KYH FDC 데이터 전송 시점 개선 ADD END
DWORD CSequenceProcessor_CPJT::GetDiskUsage()
{
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.h b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.h
index ed5b671..b661869 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.h
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.h
@@ -207,7 +207,9 @@
int nReviewCount;
void SetReviewCount(int nCount) { nReviewCount = nCount; };
int GetReviewCount() { return nReviewCount; };
- virtual void MakeDVData2(); //210325 kyh
+ //#3358 KYH FDC 데이터 전송 시점 개선 ADD START
+ virtual void MakeDVData2();
+ //#3358 KYH FDC 데이터 전송 시점 개선 ADD END
int nHistoryCount = 0;
void SetHistoryCount(int nCount) { nHistoryCount = nCount; }
--
Gitblit v1.9.3