From a35126eed28a409e5a48da7f1de4ed83093c7424 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 25 5월 2022 10:27:26 +0900
Subject: [PATCH] Ongoing90 #4157 CF AOI Review RecipeEditor OneGantryMode 시인성 강화
---
ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditor.rc | 6 ++++--
ReviewSystem/ReviewRecipeEditor/resource.h | 5 ++++-
ReviewSystem/ReviewRecipeEditor/DlgCommon.cpp | 27 ++++++++++++++++++++-------
ReviewSystem/ReviewRecipeEditor/DlgCommon.h | 8 ++++++--
4 files changed, 34 insertions(+), 12 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;
diff --git a/ReviewSystem/ReviewRecipeEditor/DlgCommon.h b/ReviewSystem/ReviewRecipeEditor/DlgCommon.h
index 3ab4721..05ddcda 100644
--- a/ReviewSystem/ReviewRecipeEditor/DlgCommon.h
+++ b/ReviewSystem/ReviewRecipeEditor/DlgCommon.h
@@ -66,6 +66,9 @@
int m_nSelectPlanIdx;
int m_nLightCount;
int m_nAFMCount;
+ /*< LYW 20220525 - #4157 ADD Start >*/
+ UINT m_nradioGantryMode;
+ /*< LYW 20220525 - #4157 ADD End >*/
BOOL m_bSelectGlassSlot[TOTAL_GLASS_SLOT_COUNT];
CFontStatic* m_ctrlStaticGlassSlot[TOTAL_GLASS_SLOT_COUNT];
@@ -82,7 +85,9 @@
afx_msg void OnBnClickedButtonLoadMaster();
-
+ /*< LYW 20220525 - #4157 ADD Start >*/
+ afx_msg void OnClickRadioGantryMode(UINT ID);
+ /*< LYW 20220525 - #4157 ADD End >*/
afx_msg void OnBnClickedButtonRcpReviewReset();
afx_msg void OnBnClickedButtonRcpReviewApply();
@@ -146,5 +151,4 @@
CComboBox m_ctrlComboGlassOrigin;
afx_msg void OnBnClickedButton4();
int m_nReflowPixelScale;
- int m_EditControl_GantryPathUse;
};
diff --git a/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditor.rc b/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditor.rc
index 3e91519..9ed677b 100644
--- a/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditor.rc
+++ b/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditor.rc
@@ -160,8 +160,10 @@
PUSHBUTTON "ChangeRCP",IDC_BUTTON4,322,41,50,14
EDITTEXT IDC_EDIT_RCP_REFLOW_PIXEL_SCALE,221,145,32,12,ES_CENTER | ES_AUTOHSCROLL
LTEXT "Pixel Scale",IDC_STATIC,184,147,34,8
- EDITTEXT IDC_EDIT_USE_SINGLE_GANTRY_PATH,268,295,48,14,ES_AUTOHSCROLL
- LTEXT "Single Gantry",IDC_STATIC,269,284,44,8
+ GROUPBOX "GantryMode",IDC_STATIC,264,291,54,46
+ CONTROL "All Gantry",IDC_RADIO_GANTRY_MODE_1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,266,301,52,9
+ CONTROL "Left Gantry",IDC_RADIO_GANTRY_MODE_2,"Button",BS_AUTORADIOBUTTON,266,312,52,9
+ CONTROL "Right Gantry",IDC_RADIO_GANTRY_MODE_3,"Button",BS_AUTORADIOBUTTON,266,323,52,9
END
IDD_DIALOG_REVIEW_RCP_EDITOR_MEASURE DIALOGEX 0, 0, 379, 526
diff --git a/ReviewSystem/ReviewRecipeEditor/resource.h b/ReviewSystem/ReviewRecipeEditor/resource.h
index cb3b8ef..346e4cd 100644
--- a/ReviewSystem/ReviewRecipeEditor/resource.h
+++ b/ReviewSystem/ReviewRecipeEditor/resource.h
@@ -296,8 +296,11 @@
#define IDC_EDIT3 1121
#define IDC_EDIT_USE_SINGLE_GANTRY_PATH 1121
#define IDC_GRID_RCP_JUDGE_CELL_JUDGEMENT 1122
+#define IDC_RADIO_GANTRY_MODE_1 1122
#define IDC_GRID_RCP_JUDGE_GLASS_JUDGEMENT_DEFECT 1123
+#define IDC_RADIO_GANTRY_MODE_2 1123
#define IDC_GRID_RCP_JUDGE_GLASS_JUDGEMENT_CELL 1124
+#define IDC_RADIO_GANTRY_MODE_3 1124
#define IDC_GRID_RCP_JUDGE_ZONE_DATA 1129
#define IDC_GRID_RCP_JUDGE_ZONE_JUDGE_SETTING 1130
#define IDC_GRID_RCP_JUDGE_ZONE_JUDGE_SETTING_PR 1131
@@ -309,7 +312,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 155
#define _APS_NEXT_COMMAND_VALUE 32771
-#define _APS_NEXT_CONTROL_VALUE 1122
+#define _APS_NEXT_CONTROL_VALUE 1123
#define _APS_NEXT_SYMED_VALUE 106
#endif
#endif
--
Gitblit v1.9.3