From 2070871df480a664c9c4e38bc4e4e324682a64c6 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 16:12:28 +0800
Subject: [PATCH] 1. 解决 WebView2 控制器创建失败时闪退的问题 2. 解决连接图销毁时保存设备图形数据闪退的问题
---
SourceCode/Bond/Servo/CPageGraph1.cpp | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.cpp b/SourceCode/Bond/Servo/CPageGraph1.cpp
index be12698..d288ba5 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph1.cpp
@@ -193,13 +193,6 @@
m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");
- // 缁戝畾鏁版嵁
- {
- SERVO::CEquipment* pEquipment = theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
- m_pGraph->SetIndicateBoxData(INDICATE_ROBOT_ARM1, pEquipment);
- }
-
-
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
}
@@ -382,15 +375,45 @@
Invalidate();
}
+void CPageGraph1::BindEquipmentToGraph()
+{
+ struct EquipmentBindInfo
+ {
+ int nEquipmentID;
+ int nIndicateID;
+ };
+
+ static const EquipmentBindInfo EQUIPMENT_BIND_LIST[] = {
+ { EQ_ID_EFEM, INDICATE_ROBOT_ARM1 },
+ { EQ_ID_EFEM, INDICATE_ROBOT_ARM2 },
+ { EQ_ID_Bonder1, INDICATE_BONDER1 },
+ { EQ_ID_Bonder2, INDICATE_BONDER2 },
+ { EQ_ID_LOADPORT1, INDICATE_LPORT1 },
+ { EQ_ID_LOADPORT2, INDICATE_LPORT2 },
+ { EQ_ID_LOADPORT3, INDICATE_LPORT3 },
+ { EQ_ID_LOADPORT4, INDICATE_LPORT4 },
+ { EQ_ID_FLIPER, INDICATE_FLIPER },
+ { EQ_ID_VACUUMBAKE, INDICATE_VACUUM_BAKE },
+ { EQ_ID_ALIGNER, INDICATE_ALIGNER },
+ { EQ_ID_BAKE_COOLING, INDICATE_BAKE_COOLING }
+ };
+
+ for (const auto& stBindInfo : EQUIPMENT_BIND_LIST)
+ {
+ SERVO::CEquipment* pEquipment = theApp.m_model.m_master.getEquipment(stBindInfo.nEquipmentID);
+ m_pGraph->SetIndicateBoxData(stBindInfo.nIndicateID, pEquipment);
+ }
+}
+
void CPageGraph1::OnGraphItemClicked(NMHDR* pNMHDR, LRESULT* pResult)
{
BYSERVOGRAPH_NMHDR* pGraphNmhdr = reinterpret_cast<BYSERVOGRAPH_NMHDR*>(pNMHDR);
CString s; s.Format(_T("OnGraphItemClicked %d"), pGraphNmhdr->dwData);
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)m_pGraph->GetIndicateBoxData(pGraphNmhdr->dwData);
if (pEquipment != nullptr) {
- AfxMessageBox(pEquipment->getName().c_str());
+ //AfxMessageBox(pEquipment->getName().c_str());
+ theApp.m_model.notifyPtr(RX_CODE_SELECT_EQUIPMENT, pEquipment);
}
-
*pResult = 0;
}
--
Gitblit v1.9.3