From d0a3207e13e320aa0b333176dc3dbf66fe1d54e5 Mon Sep 17 00:00:00 2001
From: KYH <kimyonghee@diteam.co.kr>
Date: 화, 25 5월 2021 16:41:08 +0900
Subject: [PATCH] Ongoing100 #3357 C-PJT Review Align Camera 영상 초기화 기능 개선 - Loading 시 Align Camera 영상 Vector 초기화
---
ReviewSystem/ReviewSystem/CameraControlAlign.cpp | 2 ++
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 3 ++-
ReviewSystem/ReviewSystem/CameraControlAlign.h | 6 +++++-
3 files changed, 9 insertions(+), 2 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/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 14ac4c3..74882db 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;
--
Gitblit v1.9.3