From c70166f3e86ffd0528884911483c067a6b21ebdd Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 30 6월 2023 15:48:59 +0900
Subject: [PATCH] Ongoing60 #4517 CF AOI Review 결과 파일 찾기 실패 개선 1. AOIServer RawBin 폴더 연결 TimerThread 추가 - file_dummy 생성 후 Open/Close 반복(10초) 2. 프로젝트 누락 경로 및 설정 추가 - FTPUploader Include Path, Debug모드 psapi.lib
---
ReviewSystem/ReviewSystem/CameraControlAlign.h | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/CameraControlAlign.h b/ReviewSystem/ReviewSystem/CameraControlAlign.h
index 911ae51..a3a4324 100644
--- a/ReviewSystem/ReviewSystem/CameraControlAlign.h
+++ b/ReviewSystem/ReviewSystem/CameraControlAlign.h
@@ -98,8 +98,11 @@
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 異붽�
@@ -113,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,
@@ -135,6 +142,8 @@
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);
//#3357 KYH Align Image 珥덇린�솕 ADD START
void SetAlignClearImage();
@@ -186,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