From ce7f9f6df6e34cee1cbb9e776a814bc7548e8bd1 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 28 五月 2025 17:47:55 +0800
Subject: [PATCH] 1.补允上次提交；
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 46 ++++++++++------------------------------------
1 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index f5b19e2..1b4c9ae 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -65,7 +65,7 @@
SERVO::CEquipment* pEquipment = nullptr;
if (pAny->getPtrValue("ptr", (void*&)pEquipment)) {
if (pEquipment != nullptr) {
- m_pEqsGraphWnd->ShowItemIndicator((DWORD_PTR)pEquipment, !pEquipment->isGlassListEmpty());
+ m_pEqsGraphWnd->ShowItemIndicator((DWORD_PTR)pEquipment, pEquipment->hasGlass());
}
}
}
@@ -206,14 +206,15 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
if (pEquipment->getID() == EQ_ID_LOADPORT1) {
- ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1, 10,
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1,
"P20250320G1X", 1);
}
else if (pEquipment->getID() == EQ_ID_LOADPORT2) {
- ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2, 10,
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2,
"P20250320G2X", 1);
}
- SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
+ /*
+ SERVO::CGlass* pGlass = pEquipment->getAnyGlass();
if (pGlass != nullptr) {
SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
@@ -222,12 +223,13 @@
pEquipment->onSentOutJob(0, pJobDataS);
}
}
+ */
}
else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
SERVO::CArm* pArm = (SERVO::CArm*)pEquipment->getArm();
if (pArm != nullptr) {
- SERVO::CGlass* pGlass = pArm->getFrontGlass();
+ SERVO::CGlass* pGlass = pArm->getAnyGlass();
if (pGlass != nullptr) {
SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
@@ -242,7 +244,7 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
if (pEquipment != nullptr) {
- SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
+ SERVO::CGlass* pGlass = pEquipment->getAnyGlass();
if (pGlass != nullptr) {
SERVO::CProcessData pd;
pd.setGlassId(pGlass->getID().c_str());
@@ -252,34 +254,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);
- }
-
-
// 娴嬭瘯涓嬪彂Cim Message
@@ -344,7 +318,7 @@
/*
- SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
+ SERVO::CGlass* pGlass = pEquipment->getAnyGlass();
if (pGlass != nullptr) {
std::string strDescription;
SERVO::CPath* pPath = pGlass->getPath();
@@ -450,7 +424,7 @@
m_pEqsGraphWnd->AddPin(pItem, OUTPIN, outPin->getName().c_str(), (DWORD_PTR)outPin);
}
- m_pEqsGraphWnd->ShowItemIndicator((DWORD_PTR)pEquipment, !pEquipment->isGlassListEmpty());
+ m_pEqsGraphWnd->ShowItemIndicator((DWORD_PTR)pEquipment, pEquipment->hasGlass());
}
void CPageGraph2::OnTimer(UINT_PTR nIDEvent)
--
Gitblit v1.9.3