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/CameraControlAlign.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) 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); -- Gitblit v1.9.3