From 1fd49a571338b6c946bb05dcdf59ec1468df5c50 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 목, 22 12월 2022 12:31:43 +0900
Subject: [PATCH] ongoing50 #4403 CF AOI Reveiw TACT 지연 개선 1. 일정 시간 유지 신호 처리 시 동기화로 인한 불합리 개선 - 일정 시간 유지 필요 시 스래드풀 작업큐를 이용하여 루프처리 방식으로 변경 - 유지 신호 처리 중 출력 신호 발생 시 작업큐에 등록하여 유지 신호와 결합하여 출력 처리 2. FDC 보고 항목 중 SW 버전 체크 루프 불합리 개선 - 프로그램 시작 시 연동 프로그램 버전 체크 간 실행되지 않는 프로그램이 있는 경우 무한 루프 발생 - 무한 루프로 인한 CPU 점유 상승->루프 중간 Sleep추가 및 코드 간소화 3. 로그 메시지에 시간 ms단위 추가(황만수SM 작업 내역 병합)
---
ReviewSystem/ReviewRecipeEditor/DlgCommon.cpp | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ReviewSystem/ReviewRecipeEditor/DlgCommon.cpp b/ReviewSystem/ReviewRecipeEditor/DlgCommon.cpp
index 816e708..f169d50 100644
--- a/ReviewSystem/ReviewRecipeEditor/DlgCommon.cpp
+++ b/ReviewSystem/ReviewRecipeEditor/DlgCommon.cpp
@@ -18,7 +18,7 @@
, m_nPlanCount(0)
, m_nUserDefectCount(0)
, m_nReflowPixelScale(0)
- , m_EditControl_GantryPathUse(0)
+ , m_nradioGantryMode(0)
{
m_nSelectPlanIdx = -1;
m_nLightCount = 0;
@@ -68,6 +68,9 @@
DDX_Control(pDX, IDC_STATIC_GLASS_SLOT_26, m_ctrlStaticGlassSlot_26);
DDX_Control(pDX, IDC_STATIC_GLASS_SLOT_27, m_ctrlStaticGlassSlot_27);
DDX_Control(pDX, IDC_STATIC_GLASS_SLOT_28, m_ctrlStaticGlassSlot_28);
+ /*< LYW 20220525 - #4157 ADD Start >*/
+ DDX_Radio(pDX, IDC_RADIO_GANTRY_MODE_1, (int&)m_nradioGantryMode);
+ /*< LYW 20220525 - #4157 ADD End >*/
DDX_Control(pDX, IDC_STATIC_GLASS_SLOT_ALL_SELECT, m_ctrlStaticGlassSlot_ALL_Select);
DDX_Control(pDX, IDC_STATIC_GLASS_SLOT_ALL_DESELECT, m_ctrlStaticGlassSlot_ALL_Deselect);
@@ -77,7 +80,6 @@
DDX_Control(pDX, IDC_CHECK_AUTO_LIGHT, m_ctrlAutoLight);
DDX_Control(pDX, IDC_COMBO_RCP_GLASSORIGIN, m_ctrlComboGlassOrigin);
DDX_Text(pDX, IDC_EDIT_RCP_REFLOW_PIXEL_SCALE, m_nReflowPixelScale);
- DDX_Text(pDX, IDC_EDIT_USE_SINGLE_GANTRY_PATH, m_EditControl_GantryPathUse);
}
@@ -85,14 +87,17 @@
ON_BN_CLICKED(IDC_BUTTON_RCP_REVIEW_RESET, &CDlgCommon::OnBnClickedButtonRcpReviewReset)
ON_BN_CLICKED(IDC_BUTTON_RCP_REVIEW_APPLY, &CDlgCommon::OnBnClickedButtonRcpReviewApply)
ON_CONTROL_RANGE(BN_CLICKED, IDC_STATIC_GLASS_SLOT_01, IDC_STATIC_GLASS_SLOT_28, OnGlassSlotClick)
+ ON_CONTROL_RANGE(BN_CLICKED, IDC_RADIO_GANTRY_MODE_1, IDC_RADIO_GANTRY_MODE_3, OnClickRadioGantryMode)
ON_EN_CHANGE(IDC_EDIT_RCP_REVIEW_PLAN_COUNT, &CDlgCommon::OnEnChangeEditRcpReviewPlanCount)
ON_EN_CHANGE(IDC_EDIT_RCP_REVIEW_USER_DEFECT_COUNT, &CDlgCommon::OnEnChangeEditRcpReviewUserDefectCount)
- ON_NOTIFY(NM_CLICK, IDC_GRID_RCP_REVIEW_PLAN_INFO, &CDlgCommon::OnPlanInfoGridClick)
+ ON_NOTIFY(NM_CLICK, IDC_GRID_RCP_REVIEW_PLAN_INFO, &CDlgCommon::OnPlanInfoGridClick)
ON_NOTIFY(GVN_COMBOSELCHANGE, IDC_GRID_RCP_REVIEW_USER_DEFECT_INFO, &CDlgCommon::OnSelChange)
ON_BN_CLICKED(IDC_BUTTON_LOAD_MASTER, &CDlgCommon::OnBnClickedButtonLoadMaster)
ON_NOTIFY(NM_CLICK, IDC_GRID_RCP_REFLOW_PARAMETER, &CDlgCommon::OnClickImageInfo)
ON_BN_CLICKED(IDC_BUTTON_USER_PITCH_INPUT, &CDlgCommon::OnBnClickedButtonUserPitchInput)
ON_BN_CLICKED(IDC_BUTTON4, &CDlgCommon::OnBnClickedButton4)
+ /*< LYW 20220525 - #4157 ADD Start >*/
+ /*< LYW 20220525 - #4157 ADD End >*/
END_MESSAGE_MAP()
// CDlgCommon 메시지 처리기입니다.
@@ -507,7 +512,9 @@
strItemText = m_ctrlGridScheduleInfo.GetItemText(nRowIdx, nColIdx++);
pScheduleInfo->SetMaxWsiPointCount(_ttoi(strItemText));
- pScheduleInfo->SetSingleGantryPath(m_EditControl_GantryPathUse);
+ //pScheduleInfo->SetSingleGantryPath(m_EditControl_GantryPathUse);
+
+ pScheduleInfo->SetSingleGantryPath(m_nradioGantryMode);
pCellCheck = (CGridCellCheck*)m_ctrlGridScheduleInfo.GetCell(nRowIdx, nColIdx++);
if(pCellCheck)
@@ -529,7 +536,8 @@
strItemText = m_ctrlGridScheduleRangeCntInfo.GetItemText(nRowIdx, nColIdx++);
pScheduleInfo->SetRangePointCount(Range_Right, _ttoi(strItemText));
- pScheduleInfo->SetSingleGantryPath(m_EditControl_GantryPathUse);
+ //pScheduleInfo->SetSingleGantryPath(m_EditControl_GantryPathUse);
+ pScheduleInfo->SetSingleGantryPath(m_nradioGantryMode);
//사용자 결함
nRowIdx = 1;
@@ -1256,8 +1264,8 @@
strItemText.Format(_T("%d"), pScheduleInfo->GetMaxPointCount());
m_ctrlGridScheduleInfo.SetItemText(nRowIdx, nColIdx++, strItemText);
- m_EditControl_GantryPathUse = pRsRcpReviewInfo->GetRcpSchedulingInfo()->GetSingleGantryPath();
-
+ //m_EditControl_GantryPathUse = pRsRcpReviewInfo->GetRcpSchedulingInfo()->GetSingleGantryPath();
+ m_nradioGantryMode = pRsRcpReviewInfo->GetRcpSchedulingInfo()->GetSingleGantryPath();
m_ctrlGridScheduleInfo.Invalidate(FALSE);
}
@@ -2066,6 +2074,11 @@
}
+void CDlgCommon::OnClickRadioGantryMode(UINT ID)
+{
+ return;
+}
+
void CDlgCommon::OnSetMaster(BOOL bSetMaster, int dir, CPoint* reflowPoints)
{
CString strTemp;
--
Gitblit v1.9.3