From 2f0684bf01209b9ddfdc53da44fb85f4db6db326 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 06 六月 2025 15:56:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipmentPage1.h | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.h b/SourceCode/Bond/Servo/CEquipmentPage1.h
index 994b0a0..34106f1 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage1.h
+++ b/SourceCode/Bond/Servo/CEquipmentPage1.h
@@ -1,9 +1,17 @@
锘�#pragma once
#include "CHMPropertyPage.h"
#include "CEquipment.h"
+#include "JobSlotGrid.h"
// CEquipmentPage1 瀵硅瘽妗�
+
+struct SignalInfo
+{
+ CString strName; // 淇″彿鍚嶇О
+ bool bCurrentState; // 褰撳墠鐘舵�侊紙ON/OFF锛�
+ bool bClickable; // 鏄惁鍏佽鐐瑰嚮
+};
class CEquipmentPage1 : public CHMPropertyPage
{
@@ -17,6 +25,11 @@
private:
SERVO::CEquipment* m_pEquipment;
+ std::vector<SignalInfo> m_vSignalList;
+ CJobSlotGrid m_ctrlSignalPanel;
+
+ void InitSignalList();
+ void LoadDeviceSignals();
// 瀵硅瘽妗嗘暟鎹�
@@ -30,4 +43,7 @@
DECLARE_MESSAGE_MAP()
public:
virtual BOOL OnInitDialog();
+ afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+ afx_msg void OnDestroy();
+ afx_msg void OnSize(UINT nType, int cx, int cy);
};
--
Gitblit v1.9.3