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_시_다운_현상_조치 --- DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp | 76 ++++++++++++++++++++++++++++++++++--- 1 files changed, 69 insertions(+), 7 deletions(-) diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp index 3423e3d..a7caac2 100644 --- a/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp +++ b/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp @@ -254,16 +254,47 @@ if (strlen(buffer) <= 0) continue; paser.process(buffer, " "); int nTokNum = paser.getTokNum(); - if (nTokNum < 31) continue; + if (nTokNum < 52) continue; //kyh 31->52 MacroSubPanel.PRO_IMAGE = paser.getTokStr(20); MacroSubPanel.AVG_GRAY_0 = paser.getTokStr(21); MacroSubPanel.PORTION_0 = paser.getTokStr(22); - MacroSubPanel.AVG_GRAY_1 = paser.getTokStr(24); - MacroSubPanel.PORTION_1 = paser.getTokStr(25); - MacroSubPanel.AVG_GRAY_2 = paser.getTokStr(27); - MacroSubPanel.PORTION_2 = paser.getTokStr(28); - MacroSubPanel.AVG_GRAY_3 = paser.getTokStr(30); - MacroSubPanel.PORTION_3 = paser.getTokStr(31); + //kyh 추가 + MacroSubPanel.CORNER_GRAY_0 = paser.getTokStr(23); + MacroSubPanel.AVG_AMP_0 = paser.getTokStr(24); + MacroSubPanel.FFT_VAR_0 = paser.getTokStr(25); + MacroSubPanel.FFT_VAH_0 = paser.getTokStr(26); + MacroSubPanel.FFT_VAQ_0 = paser.getTokStr(27); + MacroSubPanel.FFT_PK_0 = paser.getTokStr(28); + + MacroSubPanel.AVG_GRAY_1 = paser.getTokStr(29); + MacroSubPanel.PORTION_1 = paser.getTokStr(30); + //kyh 추가 + MacroSubPanel.CORNER_GRAY_1 = paser.getTokStr(31); + MacroSubPanel.AVG_AMP_1 = paser.getTokStr(32); + MacroSubPanel.FFT_VAR_1 = paser.getTokStr(33); + MacroSubPanel.FFT_VAH_1 = paser.getTokStr(34); + MacroSubPanel.FFT_VAQ_1 = paser.getTokStr(35); + MacroSubPanel.FFT_PK_1 = paser.getTokStr(36); + + MacroSubPanel.AVG_GRAY_2 = paser.getTokStr(37); + MacroSubPanel.PORTION_2 = paser.getTokStr(38); + //kyh 추가 + MacroSubPanel.CORNER_GRAY_2 = paser.getTokStr(39); + MacroSubPanel.AVG_AMP_2 = paser.getTokStr(40); + MacroSubPanel.FFT_VAR_2 = paser.getTokStr(41); + MacroSubPanel.FFT_VAH_2 = paser.getTokStr(42); + MacroSubPanel.FFT_VAQ_2 = paser.getTokStr(43); + MacroSubPanel.FFT_PK_2 = paser.getTokStr(44); + + MacroSubPanel.AVG_GRAY_3 = paser.getTokStr(45); + MacroSubPanel.PORTION_3 = paser.getTokStr(46); + //kyh 추가 + MacroSubPanel.CORNER_GRAY_3 = paser.getTokStr(47); + MacroSubPanel.AVG_AMP_3 = paser.getTokStr(48); + MacroSubPanel.FFT_VAR_3 = paser.getTokStr(49); + MacroSubPanel.FFT_VAH_3 = paser.getTokStr(50); + MacroSubPanel.FFT_VAQ_3 = paser.getTokStr(51); + MacroSubPanel.FFT_PK_3 = paser.getTokStr(52); vecMacroSubPanel.push_back(MacroSubPanel); } @@ -280,12 +311,43 @@ strcpy(pGrmMura->m_strProImage, m_vecMacroSubPanel[i].PRO_IMAGE.GetBuffer(0)); strcpy(pGrmMura->m_strAvgGray_0, m_vecMacroSubPanel[i].AVG_GRAY_0.GetBuffer(0)); strcpy(pGrmMura->m_strPortion_0, m_vecMacroSubPanel[i].PORTION_0.GetBuffer(0)); + //kyh 0622 + strcpy(pGrmMura->m_strCorner_Gray_0, m_vecMacroSubPanel[i].CORNER_GRAY_0.GetBuffer(0)); + strcpy(pGrmMura->m_strAvgAmp_0, m_vecMacroSubPanel[i].AVG_AMP_0.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVar_0, m_vecMacroSubPanel[i].FFT_VAR_0.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVah_0, m_vecMacroSubPanel[i].FFT_VAH_0.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVaq_0, m_vecMacroSubPanel[i].FFT_VAQ_0.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTPK_0, m_vecMacroSubPanel[i].FFT_PK_0.GetBuffer(0)); + strcpy(pGrmMura->m_strAvgGray_1, m_vecMacroSubPanel[i].AVG_GRAY_1.GetBuffer(0)); strcpy(pGrmMura->m_strPortion_1, m_vecMacroSubPanel[i].PORTION_1.GetBuffer(0)); + //kyh 0622 + strcpy(pGrmMura->m_strCorner_Gray_1, m_vecMacroSubPanel[i].CORNER_GRAY_1.GetBuffer(0)); + strcpy(pGrmMura->m_strAvgAmp_1, m_vecMacroSubPanel[i].AVG_AMP_1.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVar_1, m_vecMacroSubPanel[i].FFT_VAR_1.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVah_1, m_vecMacroSubPanel[i].FFT_VAH_1.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVaq_1, m_vecMacroSubPanel[i].FFT_VAQ_1.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTPK_1, m_vecMacroSubPanel[i].FFT_PK_1.GetBuffer(0)); + strcpy(pGrmMura->m_strAvgGray_2, m_vecMacroSubPanel[i].AVG_GRAY_2.GetBuffer(0)); strcpy(pGrmMura->m_strPortion_2, m_vecMacroSubPanel[i].PORTION_2.GetBuffer(0)); + //kyh 0622 + strcpy(pGrmMura->m_strCorner_Gray_2, m_vecMacroSubPanel[i].CORNER_GRAY_2.GetBuffer(0)); + strcpy(pGrmMura->m_strAvgAmp_2, m_vecMacroSubPanel[i].AVG_AMP_2.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVar_2, m_vecMacroSubPanel[i].FFT_VAR_2.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVah_2, m_vecMacroSubPanel[i].FFT_VAH_2.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVaq_2, m_vecMacroSubPanel[i].FFT_VAQ_2.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTPK_2, m_vecMacroSubPanel[i].FFT_PK_2.GetBuffer(0)); + strcpy(pGrmMura->m_strAvgGray_3, m_vecMacroSubPanel[i].AVG_GRAY_3.GetBuffer(0)); strcpy(pGrmMura->m_strPortion_3, m_vecMacroSubPanel[i].PORTION_3.GetBuffer(0)); + //kyh 0622 + strcpy(pGrmMura->m_strCorner_Gray_3, m_vecMacroSubPanel[i].CORNER_GRAY_3.GetBuffer(0)); + strcpy(pGrmMura->m_strAvgAmp_3, m_vecMacroSubPanel[i].AVG_AMP_3.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVar_3, m_vecMacroSubPanel[i].FFT_VAR_3.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVah_3, m_vecMacroSubPanel[i].FFT_VAH_3.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTVaq_3, m_vecMacroSubPanel[i].FFT_VAQ_3.GetBuffer(0)); + strcpy(pGrmMura->m_strFFTPK_3, m_vecMacroSubPanel[i].FFT_PK_3.GetBuffer(0)); } strcpy(pShared->GetGlassData()->m_strMaxAvgGray, strMaxAvgGray.GetBuffer(0)); strcpy(pShared->GetGlassData()->m_strMaxPortion, strMaxPortion.GetBuffer(0)); -- Gitblit v1.9.3