From d3c3d619a2fc92c8d5b2929031cf7e946d57b44a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 10:08:37 +0800
Subject: [PATCH] 1.合并后修复；
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index 3a7d3bf..cc44782 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -83,6 +83,7 @@
BOOL CPageGraph2::OnInitDialog()
{
CDialogEx::OnInitDialog();
+ InitRxWindows();
SetTimer(1, 2000, nullptr);
@@ -192,11 +193,11 @@
if (pEquipment->getID() == EQ_ID_LOADPORT1) {
pEquipment->outputGlass(1);
}
- pEquipment->fetchedOut("P20250320A1A2");
+ pEquipment->fetchedOutJob("P20250320A1A2");
}
else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- pEquipment->storeJob("P20250320A1A2");
+ pEquipment->storedJob("P20250320A1A2");
}
else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
@@ -375,7 +376,6 @@
void CPageGraph2::OnTimer(UINT_PTR nIDEvent)
{
if (1 == nIDEvent) {
- InitRxWindows();
KillTimer(1);
std::list<SERVO::CEquipment*>& eqs = theApp.m_model.m_master.getEquipmentList();
for (auto eq : eqs) {
@@ -404,6 +404,9 @@
std::list<SERVO::CEquipment*>& eqs = theApp.m_model.m_master.getEquipmentList();
for (auto item : eqs) {
EQITEM* pEqItem = m_pEqsGraphWnd->GetItem((DWORD_PTR)item);
+ if (nullptr == pEqItem) {
+ continue;
+ }
strValue.Format(_T("%d"), pEqItem->rect.left);
WritePrivateProfileString(item->getName().c_str(), _T("Left"),
--
Gitblit v1.9.3