From 3ce48f6dbeb537e252edb0d62c88a28796e36674 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 월, 26 12월 2022 15:04:42 +0900
Subject: [PATCH] ongoing60 #4403 CF AOI Review TACT 지연 개선 1. 신호 출력 방식 재개선 - 유지 시간이 없는 신호는 바로 출력 진행하도록 변경 2. 불필요 Delay 제거 및 시퀀스 변경 - 얼라인 측정 종료 처리 간 제어 신호 먼저 출력 후 카메라 Stop으로 변경 - 물류 정보 읽기 처리 후 1000ms Delay 삭제 - 얼라인 측정 시작(카메라 Live Start) 후 Delay 300ms -> 100ms(이미지 들어오는 시간 확보 필요) - ReadRawFile 처리 시작 전 500ms Delay 삭제 - Path Scheduling 완료 후 Review Ready 신호 출력 전 1000ms Delay 삭제 3. 버그 수정 - 이미지 저장 경로 생성 간 예외 처리 부분 버그 수정 4. 로그 시간 출력 불합리 개선 - 로그 시간이 파일 출력 시점으로 작성되어 로그 스래드 지연 시 시간이 맞지 않는 불합리 있음 - 로그 시간은 로그 발생 시점에 시간 저장, 해당 시간 이용하여 파일에 기록하도록 변경
---
ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h b/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
index 7392af9..08f5ec5 100644
--- a/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
+++ b/ReviewSystem/include/M_AutoDiagnosisManager/DiagnosisInfo.h
@@ -3,7 +3,8 @@
#include <vector>
// path define
-#define REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_PATH _T("C:\\DIT_Review\\DiagnosisConfig")
+#define REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_PATH _T("D:\\DIT_Review\\DiagnosisConfig") //210805
+//#define REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_PATH _T("C:\\DIT_Review\\DiagnosisConfig")
#define REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_NAME _T("AutoDiagnosisSetting.cfg")
#define REVIEW_AUTO_DIAGNOSIS_DATA_FILE_PATH _T("D:\\ResultData\\AutoDiagnosis")
#define REVIEW_AUTO_DIAGNOSIS_DATA_IMAGE_FILE_PATH _T("D:\\ResultData\\AutoDiagnosis\\ResultImage")
@@ -22,8 +23,9 @@
enum DiagnosisMode {
DiagnosisMode_All = 0,
- DiagnosisMode_Squareness,
+ DiagnosisMode_Review,
DiagnosisMode_Wsi,
+ DiagnosisMode_Squareness,
DiagnosisMode_Flatness,
DiagnosisMode_Flatness_Manual,
DiagnosisMode_Simulation
@@ -57,12 +59,14 @@
virtual void IDP2P_WsiMotorMotionEnd(int nModuleIdx, double dPosX, double dPosY) = 0;
virtual BOOL IDP2P_DiagnosisSendCompleteSig()=0;
- virtual BOOL IDP2P_DiagnosisSendJudgeAlarm() = 0; //0412 AU°¡Aø´U ½AE￡ Aß°¡
+ virtual BOOL IDP2P_DiagnosisSendJudgeAlarm() = 0; //0412 AU占싣�占폗占쏙옙占쏙옙U 占쏙옙AE占쏙옙 A占쏙옙占싣�占�
// Dialog
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 +133,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 +153,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 +174,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 +196,7 @@
m_dCameraResolution = 0.;
m_nPanelCount_Squareness = 0;
m_dJudgeData_Degree = 0.;
+ m_dSquarenessStandard = 0.;
m_dataSettingResult_Flatness.Reset();
m_nAFDelay = 0;
@@ -199,6 +208,7 @@
m_vecSettingResult_Wsi.clear();
m_nPanelCount_Wsi = 0;
m_dJudgeData_3Sigma = 0.;
+ m_dWSIStandard = 0.;
m_dPanelPosX = 0;
m_dPanelPosY = 0;
@@ -215,6 +225,9 @@
m_dReviewPanelPosY2 = 0;
m_dReviewPanelPosX4 = 0;
m_dReviewPanelPosY4 = 0;
+ /*< LYW 20210719 : #3517 ADD Start >*/
+ m_nFlatnessSkipMode = 0;
+ /*< LYW 20210719 : #3517 ADD End >*/
}
@@ -237,10 +250,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; }
+ /*< LYW 20210719 : #3517 ADD 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; }
+ /*< LYW 20210719 : #3517 ADD End >*/
// getter
@@ -272,6 +291,12 @@
double GetPanelPosY_Wsi() const { return m_dPanelPosY; }
double GetPanelPosX2_Wsi() const { return m_dPanelPosX2; }
double GetPanelPosY2_Wsi() const { return m_dPanelPosY2; }
+ /*< LYW 20210719 : #3517 ADD 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; }
+ /*< LYW 20210719 : #3517 ADD End >*/
//Review
public:
double GetReviewPanelPosX() const { return m_dReviewPanelPosX; }
@@ -300,6 +325,10 @@
int m_nCameraFrameHeight;
double m_dCameraResolution;
double m_dJudgeData_Degree;
+ /*< LYW 20210719 : #3517 ADD Start >*/
+ double m_dSquarenessStandard;
+ double m_dSquarenessStandard2;
+ /*< LYW 20210719 : #3517 ADD End >*/
// Flatness
CDiagnosisResult m_dataSettingResult_Flatness; // single data
@@ -309,11 +338,17 @@
int m_nRangeCount_Flatness;
int m_nGlassSizeX;
int m_nGlassSizeY;
+ /*< LYW 20210719 : #3517 ADD Start >*/
+ int m_nFlatnessSkipMode;
+ /*< LYW 20210719 : #3517 ADD End >*/
// wsi
VectorDiagnosisResult m_vecSettingResult_Wsi; // add module count
int m_nPanelCount_Wsi;
double m_dJudgeData_3Sigma;
+ /*< LYW 20210719 : #3517 ADD Start >*/
+ double m_dWSIStandard;
+ /*< LYW 20210719 : #3517 ADD End >*/
double m_dPanelPosX;
double m_dPanelPosY;
--
Gitblit v1.9.3