From 6e67289f2d2512398095e69b269906e5b02d5696 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 09 7월 2021 09:14:44 +0900
Subject: [PATCH] Merge branch 'feature/#3486_CF_AOI_Review_Review_History_프로그램_테스트_및_적용' into feature/#3495_CF_AOI_Review(QD,_Blue)_GlassLoading_시_다운_현상_조치
---
ReviewSystem/include/CHReviewResult/ReviewResult.h | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ReviewSystem/include/CHReviewResult/ReviewResult.h b/ReviewSystem/include/CHReviewResult/ReviewResult.h
index c2f1a2a..08ced33 100644
--- a/ReviewSystem/include/CHReviewResult/ReviewResult.h
+++ b/ReviewSystem/include/CHReviewResult/ReviewResult.h
@@ -29,14 +29,14 @@
// Wsi_X_Right_4_A_Ratio,
// Wsi_Result_Info_Count };
- // [2016:11:20]-[WEZASW] : WSI 결과 Data 항목 변경
+ // [2016:11:20]-[WEZASW] : WSI 占쏙옙占� Data 占쌓몌옙 占쏙옙占쏙옙
enum WSIResultInfo { Wsi_X_Height=0,
Wsi_X_Width,
Wsi_X_Area,
Wsi_X_A_Ratio,
Wsi_Result_Info_Count };
- // [2016:11:20]-[WEZASW] : WSI 결과 Data 항목 변경
+ // [2016:11:20]-[WEZASW] : WSI 占쏙옙占� Data 占쌓몌옙 占쏙옙占쏙옙
enum WSIReflowResultInfomation { WsiReflowInfo_AZoneJudge=0,
WsiReflowInfo_BZoneJudge,
WsiReflowInfo_CZoneJudge,
@@ -80,8 +80,8 @@
int nExposureTime; // exposure time
BOOL bDigitalZoom; // digital zoom ?
double dRulerInterval; // ruler Interval
- double dTargetMotorX; // 모터 좌표
- double dTargetMotorY; // 모터 좌표
+ double dTargetMotorX; // 占쏙옙占쏙옙 占쏙옙표
+ double dTargetMotorY; // 占쏙옙占쏙옙 占쏙옙표
int nUMGrabPosX; // Snap Pos
int nUMGrabPosY; // Snap Pos
int nReviewSnapSerialNo; // serial no
@@ -91,6 +91,7 @@
VectorImageData vectorImageData; // camera image
CString strImgFileName;
+ CString strImgFilePath;
int nMagnificationOffsetX;
int nMagnificationOffsetY;
@@ -103,16 +104,16 @@
int nReview_Square;
int nReview_Stat;
- // wsi data : 결과 파일 항목 추가
- int nWsi_ResultCode; // 성공 여부
- int nWsi_Type; // 함몰 / 돌기
+ // wsi data : 占쏙옙占� 占쏙옙占쏙옙 占쌓몌옙 占쌩곤옙
+ int nWsi_ResultCode; // 占쏙옙占쏙옙 占쏙옙占쏙옙
+ int nWsi_Type; // 占쌉몌옙 / 占쏙옙占쏙옙
int nWsi_SlopeWarn;
double pWsi_ResultData[Wsi_Result_Info_Count]; // um
int nWsiReflowPositionIndex; // WsiReflowPositionIndex
int nWsi_pReflowResultData[WsiReflowInfo_Result_Info_Count];
double dWsi_DamDistance;
bool bBigSizeDefect;
- int nMultiShotNum; //거대결함 촬영 순서
+ int nMultiShotNum; //占신댐옙占쏙옙占� 占쌉울옙 占쏙옙占쏙옙
int nGlassType; //TFE=0,MN=1,QD=2,BANK=3 CS =4 CSG = 5
@@ -151,14 +152,14 @@
VectorResultFormula vecMeasure_ResultData;
// reflow data
- int nReflow_Result; // 검출한 Line의 개수. 3 미만 : DAM2 Reflow 판정, 4~5 : DAM1 Reflow 판정, 6 : no Reflow 판정 / -1 : image not loaded, -2 : roi setting error, -3 : roi length error, -5 : select wrong side
- int pReflow_LinePosData[REFLOW_LINE_DATA]; // Line 좌표 출력 배열. DAM#2 바깥 2 Lines, DAM#2, DAM#1 순으로 좌표가 저장됨(즉, Pattern을 기준으로 바깥쪽부터 저장)
+ int nReflow_Result; // 占쏙옙占쏙옙占쏙옙 Line占쏙옙 占쏙옙占쏙옙. 3 占싱몌옙 : DAM2 Reflow 占쏙옙占쏙옙, 4~5 : DAM1 Reflow 占쏙옙占쏙옙, 6 : no Reflow 占쏙옙占쏙옙 / -1 : image not loaded, -2 : roi setting error, -3 : roi length error, -5 : select wrong side
+ int pReflow_LinePosData[REFLOW_LINE_DATA]; // Line 占쏙옙표 占쏙옙占� 占썼열. DAM#2 占쌕깍옙 2 Lines, DAM#2, DAM#1 占쏙옙占쏙옙占쏙옙 占쏙옙표占쏙옙 占쏙옙占쏙옙占�(占쏙옙, Pattern占쏙옙 占쏙옙占쏙옙占쏙옙占쏙옙 占쌕깍옙占십븝옙占쏙옙 占쏙옙占쏙옙)
int nReflow_Side;
int nInspectionMode;
int nReflow_CellIndex;
- BOOL bCheckWSISendToMotor; //모터한테 좌표 보낸건지 확인
- BOOL bCheckSendToMotor; //WSI 진행시 모터한테 좌표 보낸건지 확인
+ BOOL bCheckWSISendToMotor; //占쏙옙占쏙옙占쏙옙占쏙옙 占쏙옙표 占쏙옙占쏙옙占쏙옙占쏙옙 확占쏙옙
+ BOOL bCheckSendToMotor; //WSI 占쏙옙占쏙옙占� 占쏙옙占쏙옙占쏙옙占쏙옙 占쏙옙표 占쏙옙占쏙옙占쏙옙占쏙옙 확占쏙옙
};
typedef std::vector<SReviewResult> VectorSReviewResult;
--
Gitblit v1.9.3