From 8942dacbc2bfaf8aec6a360671de20b0fbf32273 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 26 三月 2025 13:43:32 +0800
Subject: [PATCH] 1.Equipment属性页对话框，准备用于展示Equipment数据，里面的Glass等。
---
SourceCode/Bond/Servo/CEquipment.h | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index aa9883e..af939bf 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -16,7 +16,7 @@
#include <vector>
#include <map>
#include <list>
-#include "CPanel.h"
+#include "CGlass.h"
namespace SERVO {
@@ -25,10 +25,12 @@
#define VCR_MAX 1
typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
+ typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
typedef struct _EquipmentListener
{
ONALIVE onAlive;
ONALIVE onCimStateChanged;
+ ONDATACHANGED onDataChanged;
} EquipmentListener;
// Memory Block 结构体定义
@@ -89,7 +91,10 @@
std::vector<CPin*>& CEquipment::getInputPins();
std::vector<CPin*>& CEquipment::getOutputPins();
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
-
+ virtual BOOL glassWillArrive(CGlass* pGlass);
+ virtual int outputGlass(int port);
+ virtual int glassArrived(CGlass* pGlass);
+ CGlass* getFrontGlass();
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -109,7 +114,7 @@
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
- void addPanelToList(CPanel* pPanel);
+ void addGlassToList(CGlass* pGlass);
protected:
EquipmentListener m_listener;
@@ -122,7 +127,7 @@
MemoryBlock m_blockWriteBit;
std::vector<CPin*> m_inputPins;
std::vector<CPin*> m_outputPins;
- std::list<CPanel*> m_panelList;
+ std::list<CGlass*> m_glassList;
// 以下为从CC-Link读取到的Bit标志位
--
Gitblit v1.9.3