From 625fb6aa20dd6be77a43f45d3c64b9d633417129 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 23 一月 2026 22:08:08 +0800
Subject: [PATCH] 1.实现了“空腔调机曲线模式/生产曲线模式”的切换逻辑,并在模式切换时启动/停止 DAQBridge 的采样缓存,确保空腔也能推送曲线数据; 2.菜单里新增两个选项并显示勾选状态。

---
 SourceCode/Bond/Servo/Model.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index 839e949..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,
@@ -33,9 +34,18 @@
 
 	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 notifyControlJobChanged();
 
 public:
 	int notify(int code);

--
Gitblit v1.9.3