From 8fc148424accf484b4f331c7d5fb11eb7383cf89 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 24 一月 2026 16:34:29 +0800
Subject: [PATCH] 1.点连接图子项时，如果显示生产面板则不显示属性页；
---
SourceCode/Bond/Servo/Model.h | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index c38017f..51a5427 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -4,6 +4,7 @@
#include "CMaster.h"
#include "CGlassPool.h"
#include <cstdint>
+#include <string>
enum class ControlState : uint8_t {
OfflineEquipment = 0,
@@ -31,9 +32,20 @@
int init();
int term();
+ ControlState getControlState() const noexcept { return m_currentControlState; }
+ void setControlState(ControlState newState);
+ bool raiseSoftAlarm(int alarmId,
+ const std::string& desc = "",
+ int level = -1,
+ int deviceId = 0,
+ int unitId = 0,
+ const char* deviceName = "Software",
+ const char* unitName = "App");
+ void clearSoftAlarm(int alarmId, int deviceId = 0, int unitId = 0);
+
private:
void refreshDerivedSVs();
- void setControlState(ControlState newState);
+ void notifyControlJobChanged();
public:
int notify(int code);
--
Gitblit v1.9.3