From 0c66940a8e2cf64c9890519901f433b3668216b6 Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 수, 26 6월 2024 15:13:18 +0900
Subject: [PATCH] Ongoing80 #4942 CF AOI Review Bin File Loading 실패 개선 1. GlassRawMessenger 동기화 2. BIN파일 FindFile 제거(RawMessenger, Review 공통) 3. Unloading 시 BIN파일 제거
---
ReviewSystem/ReviewSystem/CameraControlAlign.h | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/CameraControlAlign.h b/ReviewSystem/ReviewSystem/CameraControlAlign.h
index 345607a..a3a4324 100644
--- a/ReviewSystem/ReviewSystem/CameraControlAlign.h
+++ b/ReviewSystem/ReviewSystem/CameraControlAlign.h
@@ -98,10 +98,15 @@
typedef std::vector<SLightData*> VectorLightData;
typedef std::vector<SLightData*>::iterator VectorLightDataIt;
-
-enum AlignViewMode { View_Camera=0, View_Result, View_Template, View_Matching };
+/*< LYW 20211012 - #3671 MOD Start >*/
+enum AlignViewMode { View_Camera = 0, View_Result, View_Template, View_AssistantTemplate, View_Matching };
+/*< LYW 20211012 - #3671 MOD End >*/
+/*< Origin Code >*/
+//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
{
@@ -111,6 +116,10 @@
virtual void IACC2P_CameraControl(int nValue) = 0;
virtual BOOL IACC2P_SetLightLevel(int nCameraIndex, int nValue) = 0;
virtual BOOL IACC2P_GetLightLevel(int nCameraIndex, int& nValue) = 0;
+ /*< LYW 20211014 - #3671 ADD Start >*/
+ virtual int IACC2P_GetAccumaulate() = 0;
+ virtual void IACC2P_SetAccumaulate(int dValue) = 0;
+ /*< LYW 20211014 - #3671 ADD End >*/
};
class CCameraControlAlign : public CCameraController,
@@ -133,8 +142,12 @@
BOOL GetResultImage(int nCameraIndex, CCHImageData* pImageData);
BOOL SaveResultImage(int nCameraIndex, const CString& strFilename);
void SetSaveImageBasePath(CString strPath);
+ void SetSaveImageOKPath(CString strPath);
+ void SetSaveImageNGPath(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);
@@ -182,6 +195,8 @@
int m_nProcessStatus;
int m_nViewMode;
CString m_strSaveImageBasePath;
+ CString m_strSaveImageOKPath;
+ CString m_strSaveImageNGPath;
CAlignRecipe m_AlignRecipe;
CAlignResult m_AlignResult;
VectorAutoLightControl m_vecAutoLightControl;
--
Gitblit v1.9.3