From fb98a219007778cd199030ef89c7848c7f8022dd Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 23 七月 2025 16:14:59 +0800
Subject: [PATCH] 1. 优化设备配方绑定界面； 2. 获取设备的配方列表，并显示在下拉框中。
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 31 +++++--------------------------
1 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index eb40345..eca3e9e 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -127,7 +127,7 @@
ASSERT(pItem);
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- CHMPropertyDlg dlg(pEquipment->getName().c_str(), 658, 788);
+ CHMPropertyDlg dlg(pEquipment->getName().c_str(), 1258, 788);
CPageLinkSignal* pPage1 = new CPageLinkSignal();
pPage1->setEquipment(pEquipment);
@@ -159,7 +159,9 @@
}
if (pEquipment->getID() == EQ_ID_LOADPORT1
- || pEquipment->getID() == EQ_ID_LOADPORT2) {
+ || pEquipment->getID() == EQ_ID_LOADPORT2
+ || pEquipment->getID() == EQ_ID_LOADPORT3
+ || pEquipment->getID() == EQ_ID_LOADPORT4) {
CPageCassetteCtrlCmd* pPage = new CPageCassetteCtrlCmd();
pPage->setEquipment(pEquipment);
pPage->Create(IDD_PAGE_CASSETTE_CTRL_CMD);
@@ -210,30 +212,7 @@
// 娴嬭瘯
else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
- BOOL bTestGenerate = FALSE;
- SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- if (pEquipment->getID() == EQ_ID_LOADPORT4 && !pEquipment->hasGlass()) {
- ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1);
- bTestGenerate = TRUE;
- }
- /*
- else if (pEquipment->getID() == EQ_ID_LOADPORT1 && !pEquipment->hasGlass()) {
- ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2);
- bTestGenerate = TRUE;
- }
- */
- if (!bTestGenerate) {
- SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
- if (pTask != nullptr) {
- SERVO::CGlass* pGlass = (SERVO::CGlass*)pTask->getContext();
- SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
- if (pJobDataS != nullptr) {
- SERVO::CJobDataB jobDataB;
- pEquipment->onFetchedOutJob(0, &pJobDataS->getJobDataB(jobDataB));
- pEquipment->onSentOutJob(0, pJobDataS);
- }
- }
- }
+
}
else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
--
Gitblit v1.9.3