From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CCjPage2.cpp | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 104 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage2.cpp b/SourceCode/Bond/Servo/CCjPage2.cpp
index 5e79f6a..2f4d559 100644
--- a/SourceCode/Bond/Servo/CCjPage2.cpp
+++ b/SourceCode/Bond/Servo/CCjPage2.cpp
@@ -8,6 +8,11 @@
#include "RecipeManager.h"
+UINT btnID[] = { IDC_BUTTON_PORT1_PROCESS_START,
+ IDC_BUTTON_PORT2_PROCESS_START,
+ IDC_BUTTON_PORT3_PROCESS_START,
+ IDC_BUTTON_PORT4_PROCESS_START };
+
// CPjPage1 瀵硅瘽妗�
IMPLEMENT_DYNAMIC(CCjPage2, CCjPageBase)
@@ -38,6 +43,10 @@
ON_BN_CLICKED(IDC_RADIO4, &CCjPage2::OnBnClickedRadio4)
ON_NOTIFY(CSGN_SEL_CHANGED, IDC_GRID1, &CCjPage2::OnGridSelChanged)
ON_NOTIFY(CSGN_MAT_CHANGED, IDC_GRID1, &CCjPage2::OnGridMatChanged)
+ ON_BN_CLICKED(IDC_BUTTON_PORT1_PROCESS_START, &CCjPage2::OnBnClickedButtonPort1ProcessStart)
+ ON_BN_CLICKED(IDC_BUTTON_PORT2_PROCESS_START, &CCjPage2::OnBnClickedButtonPort2ProcessStart)
+ ON_BN_CLICKED(IDC_BUTTON_PORT3_PROCESS_START, &CCjPage2::OnBnClickedButtonPort3ProcessStart)
+ ON_BN_CLICKED(IDC_BUTTON_PORT4_PROCESS_START, &CCjPage2::OnBnClickedButtonPort4ProcessStart)
END_MESSAGE_MAP()
@@ -77,15 +86,6 @@
m_grid.SetPortInfo(3, _T("Port 4"), _T(""));
- // 娴嬭瘯鏁版嵁
- char szBuffer[256];
- for (int port = 0; port < 4; port++) {
- for (int slot = 0; slot < 8; slot++) {
- sprintf_s(szBuffer, 256, "Gls%04d%04d", port + 1, slot + 1);
- m_grid.SetSlotGlass(port, slot, TRUE, szBuffer, CCarrierSlotGrid::MAT_G1);
- }
- }
-
UpdatePjData();
@@ -112,12 +112,41 @@
pItem->GetWindowRect(&rcItem);
ScreenToClient(rcItem);
+
+ int x = rcItem.left + 100 + 18;
+ int y = 100;
+
+
// 璁╂帶浠剁獥鍙ｅ昂瀵歌嚜鍔ㄥ尮閰嶅綋鍓嶅垪瀹�/琛屾暟锛堜笉鍑虹幇婊氬姩鏉★級
if (::IsWindow(m_grid.m_hWnd)) {
CSize best = m_grid.CalcBestWindowSize(TRUE, -1, 2, 2);
pItem->MoveWindow(rcItem.left, rcItem.top, best.cx, best.cy);
pItem->Invalidate();
+ pItem->GetWindowRect(&rcItem);
+ ScreenToClient(rcItem);
+ y = rcItem.bottom;
+ y += 18;
}
+
+ pItem = GetDlgItem(IDC_BUTTON_PORT1_PROCESS_START);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
+ x += 220;
+
+ pItem = GetDlgItem(IDC_BUTTON_PORT2_PROCESS_START);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
+ x += 220;
+
+ pItem = GetDlgItem(IDC_BUTTON_PORT3_PROCESS_START);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
+ x += 220;
+
+ pItem = GetDlgItem(IDC_BUTTON_PORT4_PROCESS_START);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
+ x += 220;
}
int CCjPage2::OnApply()
@@ -234,6 +263,37 @@
pButton->EnableWindow(enable[i]);
m_grid.SetPortAllocated(i, !checked[i], _T(""));
+ GetDlgItem(btnID[i])->EnableWindow(checked[i]);
+ }
+
+
+ // 璇诲彇鍑虹湡瀹炴暟鎹�
+ auto& master = theApp.m_model.getMaster();
+ int EQID[] = {EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4};
+ for (int p = 0; p < 4; p++) {
+ SERVO::CLoadPort* pPort = (SERVO::CLoadPort*)master.getEquipment(EQID[p]);
+ m_grid.SetPortInfo(p,
+ (std::string("Port ") + std::to_string(p+1)).c_str(),
+ pPort->getCassetteId().c_str()
+ );
+ for (int i = 0; i < SLOT_MAX; ++i) {
+ SERVO::CSlot* pSlot = pPort->getSlot(i);
+ if (!pSlot) {
+ continue;
+ }
+
+ // 璁剧疆 Panel ID
+ SERVO::CGlass* pGlass = dynamic_cast<SERVO::CGlass*>(pSlot->getContext());
+ SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+ if (pGlass != nullptr && pJobDataS != nullptr) {
+ m_grid.SetSlotGlass(p, i, TRUE,
+ pGlass->getID().c_str(),
+ m_pjWarps[p].material[i]);
+ }
+ else {
+ m_grid.SetSlotGlass(p, i, FALSE, nullptr, CCarrierSlotGrid::MAT_G1);
+ }
+ }
}
@@ -241,7 +301,6 @@
if (portIndex != -1) {
for (int i = 0; i < 8; i++) {
m_grid.SetSlotChecked(portIndex, i, ((PJWarp*)m_pContext)->checkSlot[i]);
- m_grid.SetSlotMaterialType(portIndex, i, ((PJWarp*)m_pContext)->material[i]);
}
}
@@ -273,6 +332,7 @@
for (int i = 0; i < 4; i++) {
m_grid.SetPortAllocated(i, lock[i], _T(""));
+ GetDlgItem(btnID[i])->EnableWindow(!lock[i]);
}
ContentChanged(0);
@@ -293,6 +353,7 @@
for (int i = 0; i < 4; i++) {
m_grid.SetPortAllocated(i, lock[i], _T(""));
+ GetDlgItem(btnID[i])->EnableWindow(!lock[i]);
}
ContentChanged(0);
@@ -313,6 +374,7 @@
for (int i = 0; i < 4; i++) {
m_grid.SetPortAllocated(i, lock[i], _T(""));
+ GetDlgItem(btnID[i])->EnableWindow(!lock[i]);
}
ContentChanged(0);
@@ -333,6 +395,7 @@
for (int i = 0; i < 4; i++) {
m_grid.SetPortAllocated(i, lock[i], _T(""));
+ GetDlgItem(btnID[i])->EnableWindow(!lock[i]);
}
ContentChanged(0);
@@ -384,3 +447,34 @@
*pResult = 0;
}
+
+void CCjPage2::OnBnClickedButtonPort1ProcessStart()
+{
+ auto& master = theApp.m_model.getMaster();
+ auto port = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT1);
+ port->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+
+}
+
+void CCjPage2::OnBnClickedButtonPort2ProcessStart()
+{
+ auto& master = theApp.m_model.getMaster();
+ auto port = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT2);
+ port->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+}
+
+void CCjPage2::OnBnClickedButtonPort3ProcessStart()
+{
+ auto& master = theApp.m_model.getMaster();
+ auto port = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT3);
+ port->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+}
+
+void CCjPage2::OnBnClickedButtonPort4ProcessStart()
+{
+ auto& master = theApp.m_model.getMaster();
+ auto port = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT4);
+ port->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+}
+
+
--
Gitblit v1.9.3