From 7034036d6ab7163a6ea0e5d712ba86d6cd9591bc Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 24 七月 2025 16:37:27 +0800
Subject: [PATCH] 1. 根据文档更新JobDataS
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 65 +++++++++++---------------------
1 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index b89c7d5..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;
@@ -265,14 +244,14 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
if (pEquipment != nullptr) {
- pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
- pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
- pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
- pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, TRUE);
- pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
- pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, FALSE);
- pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
- pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, TRUE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_SEND_ABLE, TRUE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_TROUBLE, FALSE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_SEND_ABLE, TRUE);
}
if (pEquipment != nullptr && (pEquipment->getID() == EQ_ID_Bonder1
@@ -288,14 +267,14 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST5) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
if (pEquipment != nullptr) {
- pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
- pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
- pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
- pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, FALSE);
- pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
- pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, TRUE);
- pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
- pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, FALSE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignalUpstream(0, SIGNAL_SEND_ABLE, FALSE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_TROUBLE, TRUE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignalUpstream(1, SIGNAL_SEND_ABLE, FALSE);
}
}
else if (nCmd == ID_EQSGRAPHITEM_TEST6) {
@@ -379,7 +358,7 @@
// 璇锋眰涓婚厤鏂瑰垪琛�
if (pEquipment != nullptr) {
- pEquipment->masterRecipeListRequest(0);
+ pEquipment->masterRecipeListRequest(0, nullptr);
}
}
--
Gitblit v1.9.3