From b4788e99825bd153001f2ea441adc2972cefd9d1 Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 수, 16 6월 2021 13:06:49 +0900 Subject: [PATCH] Ongoing80 #3440 CF AOI Review [QD, CS] Align Cam Reverse X 제어 기능 추가 1) Align Cam Connect 시 ReverseX 파라미터 카메라에 전송 및 적용 기능 추가 --- Internal_Library/Include/CHCameraControls/CameraControlInfo.h | 58 +++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 19 deletions(-) diff --git a/Internal_Library/Include/CHCameraControls/CameraControlInfo.h b/Internal_Library/Include/CHCameraControls/CameraControlInfo.h index f82eebe..59ce65a 100644 --- a/Internal_Library/Include/CHCameraControls/CameraControlInfo.h +++ b/Internal_Library/Include/CHCameraControls/CameraControlInfo.h @@ -52,6 +52,7 @@ m_strFfcFilename = _T(""); m_strCameraFile = _T(""); + m_bCameraReverseMode = FALSE; } @@ -121,6 +122,9 @@ strValue = strItemName + _T("_FFC_FILE_NAME"); pFile->GetItem(strValue, m_strFfcFilename, _T("")); + strValue = strItemName + _T("_CAMERA_REVERSE_X"); + pFile->GetItem(strValue, m_bCameraReverseMode, 0); + return TRUE; } @@ -189,6 +193,9 @@ strValue = strItemName + _T("_FFC_FILE_NAME"); pFile->SetItem(strValue, m_strFfcFilename); + + strValue = strItemName + _T("_CAMERA_REVERSE_X"); + pFile->SetItem(strValue, m_bCameraReverseMode); return TRUE; } @@ -299,6 +306,11 @@ return m_strCameraFile; } + BOOL GetCameraReverseX( ) const + { + return m_bCameraReverseMode; + } + // setter void SetIndex(int nIndex) { @@ -405,33 +417,41 @@ { m_strCameraFile = strCameraFile; } + + void SetCameraReverseX(BOOL bMode) + { + m_bCameraReverseMode = bMode; + } protected: - int m_nIndex; // 인덱스 - CString m_strName; //카메라 이름 + int m_nIndex; // 占싸듸옙占쏙옙 + CString m_strName; //카占쌨띰옙 占싱몌옙 - int m_nLibraryType; // 라이브러리 타입 - CString m_strConnectionPort; // 연결 포트 + int m_nLibraryType; // 占쏙옙占싱브러占쏙옙 타占쏙옙 + CString m_strConnectionPort; // 占쏙옙占쏙옙 占쏙옙트 - int m_nFlipType; //카메라 FLIP 타입 - int m_nGrabberIndex; //카메라 그래버 인덱스 - int m_nChannelIndex; //카메라 채널 인덱스 - int m_nFrameWidth; //카메라 프레임 넓이 - int m_nFrameHeight; //카메라 프레임 높이 - int m_nFrameChannels; //카메라 채널 수 - int m_nGrabCount; //그랩퍼버수 - int m_nFrameCount; //카메라 프레임 개수 - int m_nImageBufferCount; //이미지 버퍼 개수 + int m_nFlipType; //카占쌨띰옙 FLIP 타占쏙옙 + int m_nGrabberIndex; //카占쌨띰옙 占쌓뤄옙占쏙옙 占싸듸옙占쏙옙 + int m_nChannelIndex; //카占쌨띰옙 채占쏙옙 占싸듸옙占쏙옙 + int m_nFrameWidth; //카占쌨띰옙 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙 + int m_nFrameHeight; //카占쌨띰옙 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙 + int m_nFrameChannels; //카占쌨띰옙 채占쏙옙 占쏙옙 + int m_nGrabCount; //占쌓뤄옙占쌜뱄옙占쏙옙 + int m_nFrameCount; //카占쌨띰옙 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙 + int m_nImageBufferCount; //占싱뱄옙占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙 - int m_nAxisDirectionX; //카메라 X축 방향 - int m_nAxisDirectionY; //카메라 Y축 방향 - double m_dPixelResolution; //카메라 해상도 + int m_nAxisDirectionX; //카占쌨띰옙 X占쏙옙 占쏙옙占쏙옙 + int m_nAxisDirectionY; //카占쌨띰옙 Y占쏙옙 占쏙옙占쏙옙 + double m_dPixelResolution; //카占쌨띰옙 占쌔삼옙 - double m_dGainRed; //카메라 Gain - double m_dGainGreen; //카메라 Gain - double m_dGainBlue; //카메라 Gain + double m_dGainRed; //카占쌨띰옙 Gain + double m_dGainGreen; //카占쌨띰옙 Gain + double m_dGainBlue; //카占쌨띰옙 Gain CString m_strFfcFilename; //FFC Image CString m_strCameraFile; + + + BOOL m_bCameraReverseMode; }; -- Gitblit v1.9.3