From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop
---
DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp
index 3423e3d..4c493ae 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/MacroResultFile.cpp
@@ -130,7 +130,7 @@
return &pBuf[nLen+1]; //구분자 건너 뛰어서 다음 읽을 포인트 넘겨준다 태현[2017/3/29]
}
-BOOL CMacroResultFile::readOptionFile( char* pFileName /*= "C:\\AOIServer\\ConfigFile\\MacroInfo.cfg"*/ )
+BOOL CMacroResultFile::readOptionFile( char* pFileName /*= "D:\\AOIServer\\ConfigFile\\MacroInfo.cfg"*/ )
{
CakFileDB fileDB;
fileDB.openfile(pFileName);
@@ -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