From e5fa774d622d6852fe8e1f033045aed221649108 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 15 10월 2021 13:24:54 +0900
Subject: [PATCH] Ongoing80 #3662 CF AOI Review 전설비 알람 발생 조치
---
DitGlassRawMessenger/Extern/DitGlassRawStruct.h | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/DitGlassRawMessenger/Extern/DitGlassRawStruct.h b/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
index c1e9afe..e5f7a55 100644
--- a/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
+++ b/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
@@ -8,6 +8,7 @@
#define RAWMESSENGER_MAXCAMNUM 30
#define RAWMESSENGER_MAXSCANNUM 20
+#define RAWMESSENGER_MAXHLINUM 8
#define MAX_ZONE_NUM 16
@@ -129,9 +130,9 @@
//카메라/스캔 정보 [김태현 2018/12/5]
short m_nCameraNum;
short m_nScanNum;
- unsigned char m_nGrayLevelAvg[RAWMESSENGER_MAXCAMNUM*RAWMESSENGER_MAXSCANNUM];
- unsigned char m_nGrayLevelMin[RAWMESSENGER_MAXCAMNUM*RAWMESSENGER_MAXSCANNUM];
- unsigned char m_nGrayLevelMax[RAWMESSENGER_MAXCAMNUM*RAWMESSENGER_MAXSCANNUM];
+ unsigned char m_nGrayLevelAvg[RAWMESSENGER_MAXCAMNUM*RAWMESSENGER_MAXSCANNUM*RAWMESSENGER_MAXHLINUM];
+ unsigned char m_nGrayLevelMin[RAWMESSENGER_MAXCAMNUM*RAWMESSENGER_MAXSCANNUM*RAWMESSENGER_MAXHLINUM];
+ unsigned char m_nGrayLevelMax[RAWMESSENGER_MAXCAMNUM*RAWMESSENGER_MAXSCANNUM*RAWMESSENGER_MAXHLINUM];
//얼라인 정보 um[김태현 2018/12/10]
double m_nAlignCcdTheta;
@@ -143,6 +144,9 @@
double m_nAlignBasicTheta;
double m_nAlignBasicShitftX;
double m_nAlignBasicShitftY;
+ char m_strAlignFirst[64];
+ char m_strAlignSecond[64];
+// char m_strAlignPath[256];
//CSOT용 물류 정보 [김태현 2018/12/5]
char m_strCassetteSequenceNo[16];
@@ -173,8 +177,8 @@
char m_strCount2[2];
//Mura Data 0412 nwh
- float m_fMaxAvgGray;
- float m_fMaxPortion;
+ char m_strMaxAvgGray[12];
+ char m_strMaxPortion[12];
//1226NWH
@@ -191,6 +195,8 @@
int m_nStackNum;
BOOL m_bStackRead;
+ int m_nRawMergeNum;
+ BOOL m_bRawMergeRead;
//210203 CJH - CutOff 대상 결함 수
int m_nCutOffDefectNum;
//210323 CJH - Server/Frame Shrink 정보 추가
@@ -254,11 +260,45 @@
//Mura Data nwh 0404
char m_strProImage[32];
- float m_fAvgGray;
- float m_fPortion;
+ char m_strAvgGray_0[12];
+ char m_strPortion_0[12];
+ //kyh Mura Data 추가 0622
+ char m_strCorner_Gray_0[12];
+ char m_strAvgAmp_0[12];
+ char m_strFFTVar_0[12];
+ char m_strFFTVah_0[12];
+ char m_strFFTVaq_0[12];
+ char m_strFFTPK_0[12];
+ char m_strAvgGray_1[12];
+ char m_strPortion_1[12];
+ //kyh Mura Data 추가 0622
+ char m_strCorner_Gray_1[12];
+ char m_strAvgAmp_1[12];
+ char m_strFFTVar_1[12];
+ char m_strFFTVah_1[12];
+ char m_strFFTVaq_1[12];
+ char m_strFFTPK_1[12];
+ char m_strAvgGray_2[12];
+ char m_strPortion_2[12];
+ //kyh Mura Data 추가 0622
+ char m_strCorner_Gray_2[12];
+ char m_strAvgAmp_2[12];
+ char m_strFFTVar_2[12];
+ char m_strFFTVah_2[12];
+ char m_strFFTVaq_2[12];
+ char m_strFFTPK_2[12];
+ char m_strAvgGray_3[12];
+ char m_strPortion_3[12];
+ //kyh Mura Data 추가 0622
+ char m_strCorner_Gray_3[12];
+ char m_strAvgAmp_3[12];
+ char m_strFFTVar_3[12];
+ char m_strFFTVah_3[12];
+ char m_strFFTVaq_3[12];
+ char m_strFFTPK_3[12];
int m_nDefectNumJudgeOKWhite;
int m_nDefectNumJudgeOKBlack;
@@ -303,6 +343,7 @@
float m_fManification;
float m_fManificResoultion;
char m_strRevImageName[256];
+ char m_strRevImagePath[256];
//////////////////////////////////////////////////////////////////////////
// Measure 영역
@@ -376,6 +417,7 @@
int m_nPixelGlassStart; // Glass 시작 픽셀
short m_sDefectLoc;
+ short m_sZoneClassPixelCount[16];
short m_sZonePixelCount[16]; // Zone별 결함 Pixel 수
short m_sZoneValueMin[16]; // Zone별 결함 Min
short m_sZoneValueMax[16]; // Zone별 결함 Max
@@ -463,8 +505,15 @@
BOOL m_bShrinked; //210323 CJH - Frame Shrink 정보 추가
+ char m_strAoiImagePath[255];
+ char m_strReviewImagePath[255];
- //리뷰 디펙 정보 [김태현 2019/1/19]
+ int m_nAlignRectLeft;
+ int m_nAlignRectTop;
+ int m_nAlignRectBottom;
+ int m_nAlignRectRight;
+
+
_grmDefectReviewData m_ReviewDefect;
};
@@ -487,6 +536,8 @@
grcWriteBin = 201,
grcReadBin = 202,
+
+ grcReviewWriteBIn = 301,
grcGlassRawCommand
};
@@ -514,6 +565,7 @@
int m_nCellMaxDataNum;
int m_nDefectMaxDataNum;
int m_nStackMaxDataNum;
+ int m_nRawMergeMaxDataNum;
//Char 기준 자료가 있는 시작 위치 [김태현 2018/11/12]
int m_nGlassDataPoint;
@@ -521,12 +573,14 @@
int m_nCellDataPoint;
int m_nDefectDataPoint;
int m_nStackDataPoint;
+ int m_nRawMergeDataPoint;
int m_nSizeOfGlassData;
int m_nSizeOfBlockData;
int m_nSizeOfCellData;
int m_nSizeOfDefectData;
int m_nSizeOfStackData;
+ int m_nSizeOfRawMergeData;
};
struct _grmDitGlassRawInfo : public _grmDitMemInfo, public _grmDitCommand
{
--
Gitblit v1.9.3