From e937700184e21d263b771921b269fbdda341dfc4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 14:39:40 +0800
Subject: [PATCH] 1.master调试线程实现，状态，运行时间等；
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 56 +++++++++++---------------------------------------------
1 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index 3e161a7..7f3da57 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -10,10 +10,9 @@
#include "CEquipmentPage2.h"
#include "CEquipmentPage3.h"
#include "CPagePortProperty.h"
+#include "CPagePortStatus.h"
#include "CPageCassetteCtrlCmd.h"
#include "CJobDataB.h"
-#include "CRobotCmdContainerDlg.h"
-#include "CRobotCmdTestDlg.h"
// CPageGraph2 瀵硅瘽妗�
@@ -127,13 +126,18 @@
ASSERT(pItem);
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- CHMPropertyDlg dlg(pEquipment->getName().c_str(), 600, 680);
+ CHMPropertyDlg dlg(pEquipment->getName().c_str(), 658, 788);
if (_strcmpi(pEquipment->getClassName(), "CLoadPort") == 0) {
- CPagePortProperty* pPage1 = new CPagePortProperty();
- pPage1->setLoadPort((SERVO::CLoadPort*)pEquipment);
- pPage1->Create(IDD_PAGE_PORT_PROPERTY);
- dlg.addPage(pPage1, "灞炴��");
+ CPagePortProperty* pPageA = new CPagePortProperty();
+ pPageA->setLoadPort((SERVO::CLoadPort*)pEquipment);
+ pPageA->Create(IDD_PAGE_PORT_PROPERTY);
+ dlg.addPage(pPageA, "灞炴��");
+
+ CPagePortStatus* pPageB = new CPagePortStatus();
+ pPageB->setLoadPort((SERVO::CLoadPort*)pEquipment);
+ pPageB->Create(IDD_PAGE_PORT_STATUS);
+ dlg.addPage(pPageB, "Status");
}
CEquipmentPage2* pPage2 = new CEquipmentPage2();
@@ -248,44 +252,6 @@
}
else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
-
- /* 娴嬭瘯 RobotCMD */
- if (pEquipment->getID() == EQ_ID_EFEM) {
- SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)pEquipment;
-
- //SERVO::ROBOT_CMD_PARAM cmds[4];
- //cmds[0].sequenceNo = 1;
- //cmds[0].rcmd = (short)SERVO::RCMD::Move;
- //cmds[0].armNo = 1;
- //cmds[0].getPosition = 1;
- //cmds[0].putPosition = 2;
- //cmds[0].getSlotNo = 3;
- //cmds[0].putSlotNo = 4;
- //cmds[0].subCmd = 5;
- //cmds[1].sequenceNo = 2;
- //cmds[1].rcmd = (short)SERVO::RCMD::Transfer;
- //cmds[1].armNo = 2;
- //cmds[1].getPosition = 6;
- //cmds[1].putPosition = 7;
- //cmds[1].getSlotNo = 8;
- //cmds[1].putSlotNo = 9;
- //cmds[1].subCmd = 10;
- //pEFEM->robotCmds(cmds, 2);
-
- //CRobotCmdContainerDlg dlg;
- //if (dlg.DoModal() == IDOK) {
- // std::vector<SERVO::ROBOT_CMD_PARAM>& cmds = dlg.GetResultCmds();
- // if (!cmds.empty()) {
- // pEFEM->robotCmds(cmds.data(), (int)cmds.size());
- // }
- //}
-
- CRobotCmdTestDlg dlg;
- dlg.SetEFEM(pEFEM);
- dlg.DoModal();
- }
-
-
// 娴嬭瘯涓嬪彂Cim Message
--
Gitblit v1.9.3