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
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 196 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 149 insertions(+), 47 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index d9e48c2..bc5e21a 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -40,6 +40,11 @@
#include <fstream>
#include <afxwin.h>
+#include <sstream> /* < KJG 20230605 - #4517 ADD >*/
+#include <filesystem> /* < KJG 20230605 - #4517 ADD >*/
+
+namespace fs = std::experimental::filesystem::v1; /* < KJG 20230605 - #4517 ADD >*/
+
#define GLASS_GD_FILE_PATH _T("GD")
#define SIGNAL_SEND_RESULT_SUCCESS _T("OK")
@@ -550,10 +555,16 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail Data!"));
}
- AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence 蹂�寃�
-
+ /*< SWK 20221226 - #4403 MOD Start >*/
+// AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence 蹂�寃�
+//
+// SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
+// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));
SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));
+
+ AlignCamera_CameraControl(CameraControlStop);
+ /*< SWK 20221226 - #4403 MOD End >*/
// LJY-20180905
m_pSP2P->ISP2P_UpdateAlignResultStatus(0, pGlassResult);
@@ -949,6 +960,10 @@
//SetUploadResultFailCount(0);
bFileFind = FALSE;
+
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] FileMonitor Thread Stop Ready"));
+ m_pSP2P->ISP2P_GetReviewProcessor()->FileMonitorThreadStop(); /* < KJG 20230630 - #4517 ADD Start >*/
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] FileMonitor Thread Stop Complete"));
/*< LYW 20211109 - #3662 Delete Start >*/
//m_pSP2P->ISP2P_GetDiagnosisHistory();
@@ -1101,7 +1116,8 @@
/*bFileFind = FindRawBinFile(strFileName);*/
pDitRawClient->SetReviewStart();
- Sleep(1000);
+ //< SWK 20221226 - #4403 DEL >
+// Sleep(1000);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Transfer Data Read Success!"));
@@ -1318,7 +1334,8 @@
}
//#3561 210908 LYW ADD End
- Sleep(300);
+ //< SWK 20221226 - #4403 MOD >
+ Sleep(100);
//original
// if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_AlignStartAck_CPJT))
@@ -1440,7 +1457,9 @@
//pDitRawClient->SetReviewStart();
- Sleep(500);
+ //< SWK 20221226 - #4403 DEL >
+// Sleep(500);
+
//CString strJudgeData;
m_pSP2P->ISP2P_GetSignalControl()->WriteData(_T("17110"), sizeof(pDitRawClient->GetGlassData()->m_strGlassJudge), pDitRawClient->GetGlassData()->m_strGlassJudge);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] ReadRawFile!"));
@@ -1501,7 +1520,8 @@
int nTotalPlanCount = CalculatePlanData(pGlassResult);
m_pSP2P->ISP2P_DisplayMessage(_T("[Read Raw File] Review All Plan Total Count : %d"), nTotalPlanCount);
- Sleep(1000);
+ //< SWK 20221226 - #4403 DEL >
+// Sleep(1000);
// send review ready
//#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD START
if (GetSimulationMode() == FALSE)
@@ -1877,7 +1897,10 @@
//#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD END
// if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_ReviewUnloadingAck_CPJT))
// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewStart] Send Review Unloading Ack!"));
-
+
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] FileMonitor Thread Start Ready"));
+ m_pSP2P->ISP2P_GetReviewProcessor()->FileMonitorThreadStart(); /* < KJG 20230630 - #4517 ADD Start >*/
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] FileMonitor Thread Start Complete"));
}
@@ -2884,6 +2907,18 @@
BOOL CSequenceProcessor_CPJT::FindRawBinFile(CString strFileName)
{
+ /* < KJG 20230605 - #4517 ADD Start >*/
+ auto FuncStringSplit = [](string Sentence, char Separator, vector<string>& vec)
+ {
+ stringstream ss(Sentence);
+ string tmp;
+
+ while (getline(ss, tmp, Separator)) {
+ vec.push_back(tmp);
+ }
+ };
+ /* < KJG 20230605 - #4517 ADD End >*/
+
//210128
CString strFilePath = _T("");
//pData->GetGlassData()->m_strFileName;
@@ -2905,60 +2940,121 @@
//#3359_LYW CF AOI Review REVIEW_LOADING_COMPLETE_TIMEOVER START
if (nReTryTime%2 == 0)
{
- strFilePath = AOIRAWBIN_PATH;
+ strFilePath = AOIRAWBIN_NETWORK_DRIVE_PATH;
}
- else strFilePath = AOIRAWBIN_NETWORK_DRIVE_PATH;
+ else strFilePath = AOIRAWBIN_PATH;
- strWild.Format("%s\\%s_*.bin", strFilePath, strFileName);
- akFileFinder.FindFile(strWild.GetBuffer(0), FALSE);
- //LYW LOG
- g_pLog->DisplayMessage(_T("[GlassLoading][FindRawBinFile] Find Path = %s, RetryCount = %d, ResultCode = [%d]"), strFilePath, 30-nReTryTime, GetLastError());
- //#3359_LYW CF AOI Review REVIEW_LOADING_COMPLETE_TIMEOVER END
- VECFINDDATA* pFindData = akFileFinder.getFindData();
- int nFileNamePos = strlen(akFileFinder.getProcessPath());
- std::map<LONGLONG, CString> mapSpanFileName;
- for (int i = 0; i < pFindData->size(); i++)
+ //strWild.Format("%s\\%s_*.bin", strFilePath, strFileName); /* < KJG 20230605 - #4517 DEL >*/
+ //akFileFinder.FindFile(strWild.GetBuffer(0), FALSE); /* < KJG 20230605 - #4517 DEL >*/
+
+ /* < KJG 20230605 - #4517 ADD Start >*/
+ auto timeStart = chrono::steady_clock::now();
+ g_pLog->DisplayMessage(_T("[GlassLoading][FindRawBinFile] Start Find Path = %s, File Name = %s, TryCount = %d"), strFilePath, strFileName, 30 - nReTryTime);
+
+ std::error_code err;
+ vector<std::string> vtFileList;
+ fs::path pathBinFile(strFilePath.GetBuffer(0));
+ int constexpr SaperatorCount = 4, DateSize = 8, TimeSize = 6; // GLASSID_STEPID_'YYYYMMDD'_'HHMMSS' �룷留� �솗�씤
+ for (auto iter = fs::directory_iterator(pathBinFile, err); iter != fs::directory_iterator(); iter++)
{
- char* pFileName = &((*pFindData)[i]).name[nFileNamePos];
+ fs::path p = iter->path();
+ if (p.filename().stem().string().find(strFileName) != string::npos)
{
- CakParser parser;
- parser.process(pFileName, "_.");
- if (parser.getTokNum() < 4) continue;
-
- if (parser.getTokNum() >= 6) continue; // 0401
-
- int nDataTime[8] = {};
+ std::string strSearchFile = p.filename().stem().string();
+ if (p.extension().string() == _T(".bin"))
{
- int nTokIndex = 0;
- const char* pGlassId = parser.getTokStr(nTokIndex++);
- const char* pStepId = parser.getTokStr(nTokIndex++);
- char* pDate = &pFileName[parser.getTokPos(nTokIndex++)];
- char* pTime = &pFileName[parser.getTokPos(nTokIndex++)];
-
- nDataTime[0] = (pDate[0] - '0') * 1000 + (pDate[1] - '0') * 100 + (pDate[2] - '0') * 10 + (pDate[3] - '0') * 1;
- nDataTime[1] = (pDate[4] - '0') * 10 + (pDate[5] - '0') * 1;
- nDataTime[2] = (pDate[6] - '0') * 10 + (pDate[7] - '0') * 1;
- nDataTime[3] = (pTime[0] - '0') * 10 + (pTime[1] - '0') * 1;
- nDataTime[4] = (pTime[2] - '0') * 10 + (pTime[3] - '0') * 1;
- nDataTime[5] = (pTime[4] - '0') * 10 + (pTime[5] - '0') * 1;
+ vtFileList.push_back(p.filename().stem().string());
}
-
- CTime tmTemp(nDataTime[0], nDataTime[1], nDataTime[2], nDataTime[3], nDataTime[4], nDataTime[5]);
- CTimeSpan tmSpan = tmReviewLoading - tmTemp;
- mapSpanFileName.insert(std::make_pair(tmSpan.GetTotalSeconds(), pFileName));
}
}
- if (mapSpanFileName.empty() == FALSE)
+ for (auto iter = vtFileList.begin(); iter != vtFileList.end(); )
{
- if (mapSpanFileName.begin()->first < nCloseTime)
+ vector<string> vtSplit;
+ FuncStringSplit(*iter, _T('_'), vtSplit);
+
+ if (vtSplit.size() == SaperatorCount && vtSplit[2].size() == DateSize && vtSplit[3].size() == TimeSize)
{
- strFindFile = mapSpanFileName.begin()->second;
+ iter++;
+ }
+ else
+ {
+ vtFileList.erase(iter);
+ }
+ }
+
+ sort(vtFileList.begin(), vtFileList.end(), greater<>()); // 理쒖떊�닚�쑝濡� �젙�젹
+
+ string strPickFileName = vtFileList.empty() ? _T("NULL") : vtFileList.front();
+ g_pLog->DisplayMessage(_T("[GlassLoading][FindRawBinFile] End File Count = %d, Pick File Name = %s, Tact = %d, ErrorCode = %d, ErrorMsg = %s"), vtFileList.size(), strPickFileName.c_str(), chrono::duration_cast<chrono::milliseconds>(chrono::steady_clock::now() - timeStart).count(),err.value(), err.message().c_str());
+
+ if (vtFileList.empty() == FALSE)
+ {
+ vector<string> vtSplit;
+ FuncStringSplit(strPickFileName, _T('_'), vtSplit);
+
+ CTime tmTemp(stoi(vtSplit[2].substr(0, 4)), stoi(vtSplit[2].substr(4, 2)), stoi(vtSplit[2].substr(6, 2)), stoi(vtSplit[3].substr(0, 2)), stoi(vtSplit[3].substr(2, 2)), stoi(vtSplit[3].substr(4, 2)));
+ CTimeSpan tmSpan = tmReviewLoading - tmTemp;
+
+ if (tmSpan < nCloseTime)
+ {
+ strFindFile = strPickFileName.c_str();
+ g_pLog->DisplayMessage(_T("[GlassLoading][FindRawBinFile] Find File Success"));
break;
}
}
+ /* < KJG 20230605 - #4517 ADD End >*/
- akFileFinder.clear();
+ /* < KJG 20230605 - #4517 DEL Start >*/
+ //#3359_LYW CF AOI Review REVIEW_LOADING_COMPLETE_TIMEOVER END
+ //VECFINDDATA* pFindData = akFileFinder.getFindData();
+ //int nFileNamePos = strlen(akFileFinder.getProcessPath());
+ //std::map<LONGLONG, CString> mapSpanFileName;
+ //for (int i = 0; i < pFindData->size(); i++)
+ //{
+ // char* pFileName = &((*pFindData)[i]).name[nFileNamePos];
+ // {
+ // CakParser parser;
+ // parser.process(pFileName, "_.");
+ // if (parser.getTokNum() < 4) continue;
+ //
+ // if (parser.getTokNum() >= 6) continue; // 0401
+ //
+ // int nDataTime[8] = {};
+ // {
+ // int nTokIndex = 0;
+ // const char* pGlassId = parser.getTokStr(nTokIndex++);
+ // const char* pStepId = parser.getTokStr(nTokIndex++);
+ // char* pDate = &pFileName[parser.getTokPos(nTokIndex++)];
+ // char* pTime = &pFileName[parser.getTokPos(nTokIndex++)];
+ //
+ // nDataTime[0] = (pDate[0] - '0') * 1000 + (pDate[1] - '0') * 100 + (pDate[2] - '0') * 10 + (pDate[3] - '0') * 1;
+ // nDataTime[1] = (pDate[4] - '0') * 10 + (pDate[5] - '0') * 1;
+ // nDataTime[2] = (pDate[6] - '0') * 10 + (pDate[7] - '0') * 1;
+ // nDataTime[3] = (pTime[0] - '0') * 10 + (pTime[1] - '0') * 1;
+ // nDataTime[4] = (pTime[2] - '0') * 10 + (pTime[3] - '0') * 1;
+ // nDataTime[5] = (pTime[4] - '0') * 10 + (pTime[5] - '0') * 1;
+ // }
+ //
+ // CTime tmTemp(nDataTime[0], nDataTime[1], nDataTime[2], nDataTime[3], nDataTime[4], nDataTime[5]);
+ // CTimeSpan tmSpan = tmReviewLoading - tmTemp;
+ // mapSpanFileName.insert(std::make_pair(tmSpan.GetTotalSeconds(), pFileName));
+ // }
+ //}
+ //
+ //if (mapSpanFileName.empty() == FALSE)
+ //{
+ // if (mapSpanFileName.begin()->first < nCloseTime)
+ // {
+ // strFindFile = mapSpanFileName.begin()->second;
+ // break;
+ // }
+ //}
+ //
+ //akFileFinder.clear();
+ /* < KJG 20230605 - #4517 DEL End >*/
+
+
Sleep(100);
}
}
@@ -3674,7 +3770,9 @@
tmServerLoadingTime = CTime::GetCurrentTime();
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] access Shared Memory Fail"));
strPath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), pNetworkInfo->m_strUploadImagePath, strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
- strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
+ //< SWK 20221226 - #4403 MOD >
+// strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
+ strImagePath.Format(_T("%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
CreateDirectory(strPath, NULL);
pReviewProcessor->SetUploadImagePath(strPath);
pReviewProcessor->SetReviewImagePath(strImagePath);
@@ -4363,6 +4461,7 @@
// set offset
ApplyMotorOffset(pReview->nModuleIdx, pReview->nZoomIdx, MotorOffsetCamera + MotorOffsetMag+MotorOffset_Glass, dDefectPosX, dDefectPosY);
+ m_pSP2P->CalcMotorOffSetValue(pReview->nModuleIdx, dDefectPosX, dDefectPosY); //< KEJ 20230622 - #4526 ADD >
//xpostemp = dDefectPosX;
//ypostemp = dDefectPosY;
@@ -4663,6 +4762,7 @@
// set offset
ApplyMotorOffset(pReview->nModuleIdx, pReview->nZoomIdx, MotorOffsetCamera + MotorOffsetMag + MotorOffset_Glass, dDefectPosX, dDefectPosY);
+ m_pSP2P->CalcMotorOffSetValue(pReview->nModuleIdx, dDefectPosX, dDefectPosY); //< KEJ 20230622 - #4526 ADD >
//xpostemp = dDefectPosX;
//ypostemp = dDefectPosY;
@@ -4920,6 +5020,8 @@
// set offset
ApplyMotorOffset(pWsi->nModuleIdx, -1, MotorOffsetCamera + MotorOffsetWSI + MotorOffset_Glass, dDefectPosX, dDefectPosY);
+ m_pSP2P->CalcMotorOffSetValue(pWsi->nModuleIdx, dDefectPosX, dDefectPosY); //< KEJ 20230622 - #4526 ADD >
+
m_pSP2P->GetOffSetValue(nModuleIdx, pWsi->nAOICameraIdx, pWsi->nAOIScanIdx, pWsi->nUMOriginX / 1000.0, xpostemp, ypostemp);
xpostemp = floor(xpostemp * 1000);
--
Gitblit v1.9.3