From 5c62f2269ac6179a22b475093f35be2fb0999bb2 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 월, 09 8월 2021 11:05:03 +0900
Subject: [PATCH] Merge branch 'feature/#3477_CF_AOI_Review_FrameLost_현상_조치' into develop
---
ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h b/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
index 7392af9..8de970b 100644
--- a/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
+++ b/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
@@ -22,8 +22,9 @@
enum DiagnosisMode {
DiagnosisMode_All = 0,
- DiagnosisMode_Squareness,
+ DiagnosisMode_Review,
DiagnosisMode_Wsi,
+ DiagnosisMode_Squareness,
DiagnosisMode_Flatness,
DiagnosisMode_Flatness_Manual,
DiagnosisMode_Simulation
@@ -63,6 +64,8 @@
virtual BOOL IDP2P_SetDlgFlatness(int nIndex) = 0;
virtual BOOL IDP2P_SetDialogTap(int nIndex) = 0;
virtual void IDP2P_UpdateDialog(int nIndex = -1) = 0;
+
+ virtual BOOL IDP2P_CheckManualMode() = 0;
};
struct SPositionData
@@ -129,6 +132,7 @@
void SetHeight3Sigma(double dData) { m_dHeight3Sigma = dData; }
void SetACC(double dData) { m_dACC = dData; }
void SetRTB(double dData) { m_dRTB = dData; }
+ void SetDiagnosisHeight(double dData, int idx) { m_dDiagnosisHeight[idx] = dData; }
// getter
int GetModuleIndex() const { return m_nModuleIndex; }
@@ -148,6 +152,8 @@
double GetHeight3Sigma() const { return m_dHeight3Sigma; }
double getWSI_ACC() const {return m_dACC;}
double getWSI_RTB() const { return m_dRTB; }
+ double GetDiagnosisHeight(int idx) const { return m_dDiagnosisHeight[idx]; }
+
protected:
int m_nModuleIndex;
@@ -167,6 +173,7 @@
double m_dHeight3Sigma;
double m_dACC;
double m_dRTB;
+ double m_dDiagnosisHeight[10];
};
typedef std::vector<CDiagnosisResult> VectorDiagnosisResult;
typedef std::vector<CDiagnosisResult>::iterator VectorDiagnosisResultIt;
@@ -188,6 +195,7 @@
m_dCameraResolution = 0.;
m_nPanelCount_Squareness = 0;
m_dJudgeData_Degree = 0.;
+ m_dSquarenessStandard = 0.;
m_dataSettingResult_Flatness.Reset();
m_nAFDelay = 0;
@@ -199,6 +207,7 @@
m_vecSettingResult_Wsi.clear();
m_nPanelCount_Wsi = 0;
m_dJudgeData_3Sigma = 0.;
+ m_dWSIStandard = 0.;
m_dPanelPosX = 0;
m_dPanelPosY = 0;
@@ -215,6 +224,9 @@
m_dReviewPanelPosY2 = 0;
m_dReviewPanelPosX4 = 0;
m_dReviewPanelPosY4 = 0;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_START
+ m_nFlatnessSkipMode = 0;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_END
}
@@ -237,10 +249,16 @@
void SetPanelCount_Wsi(int nCount) { m_nPanelCount_Wsi = nCount; }
void SetJudgeData_3Sigma(double dData) { m_dJudgeData_3Sigma = dData; }
- void GetPanelPosX_Wsi(double dData) { m_dPanelPosX = dData; }
- void GetPanelPosY_Wsi(double dData) { m_dPanelPosY = dData; }
- void GetPanelPosX2_Wsi(double dData) { m_dPanelPosX2 = dData; }
- void GetPanelPosY2_Wsi(double dData) { m_dPanelPosY2 = dData; }
+ void SetPanelPosX_Wsi(double dData) { m_dPanelPosX = dData; }
+ void SetPanelPosY_Wsi(double dData) { m_dPanelPosY = dData; }
+ void SetPanelPosX2_Wsi(double dData) { m_dPanelPosX2 = dData; }
+ void SetPanelPosY2_Wsi(double dData) { m_dPanelPosY2 = dData; }
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_START
+ void SetFlastnessSkipMode(double dData) { m_nFlatnessSkipMode = dData; }
+ void SetSquarenessStandard(double dData) { m_dSquarenessStandard = dData; }
+ void SetSquarenessStandard2(double dData) { m_dSquarenessStandard2 = dData; }
+ void SetWSIStandard(double dData) { m_dWSIStandard = dData; }
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_END
// getter
@@ -272,6 +290,12 @@
double GetPanelPosY_Wsi() const { return m_dPanelPosY; }
double GetPanelPosX2_Wsi() const { return m_dPanelPosX2; }
double GetPanelPosY2_Wsi() const { return m_dPanelPosY2; }
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_START
+ int GetFlastnessSkipMode() const { return m_nFlatnessSkipMode; }
+ double GetSquarenessStandard() const { return m_dSquarenessStandard; }
+ double GetSquarenessStandard2() const { return m_dSquarenessStandard2; }
+ double GetWSIStandard() const { return m_dWSIStandard; }
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_END
//Review
public:
double GetReviewPanelPosX() const { return m_dReviewPanelPosX; }
@@ -300,6 +324,10 @@
int m_nCameraFrameHeight;
double m_dCameraResolution;
double m_dJudgeData_Degree;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_START
+ double m_dSquarenessStandard;
+ double m_dSquarenessStandard2;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_END
// Flatness
CDiagnosisResult m_dataSettingResult_Flatness; // single data
@@ -309,11 +337,17 @@
int m_nRangeCount_Flatness;
int m_nGlassSizeX;
int m_nGlassSizeY;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_START
+ int m_nFlatnessSkipMode;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_END
// wsi
VectorDiagnosisResult m_vecSettingResult_Wsi; // add module count
int m_nPanelCount_Wsi;
double m_dJudgeData_3Sigma;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_START
+ double m_dWSIStandard;
+ //#3514_LYW_CF AOI Review 자가진단 기능 개선_END
double m_dPanelPosX;
double m_dPanelPosY;
--
Gitblit v1.9.3