From 6fc65c5cf54432d1044fbe9799aca76f7273798c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 23 五月 2025 18:02:27 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index cbce17f..7e4811e 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -10,9 +10,11 @@
#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 瀵硅瘽妗�
@@ -126,13 +128,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();
@@ -271,13 +278,17 @@
//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());
- }
- }
+ //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();
}
--
Gitblit v1.9.3