From 2ece96546ec80bf26013d005967cbfdc06156ee7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 17 六月 2025 16:32:41 +0800
Subject: [PATCH] 1. 添加配方管理类（数据库） 2. 修改用户管理和系统日志管理类的路径和名称 3. 修复合并代码导致系统日志管理窗口的资源异常的问题
---
SourceCode/Bond/Servo/Model.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index 6e2655c..d2c4e0c 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -2,6 +2,7 @@
#include "Configuration.h"
#include "HsmsPassive.h"
#include "CMaster.h"
+#include "CGlassPool.h"
class CModel
{
@@ -11,7 +12,9 @@
public:
IObservable* getObservable();
+ SERVO::CMaster& getMaster();
void setWorkDir(const char* pszWorkDir);
+ void loadPortParams();
int init();
int term();
@@ -32,6 +35,7 @@
public:
CConfiguration m_configuration;
CHsmsPassive m_hsmsPassive;
+ SERVO::CGlassPool m_glassPool;
SERVO::CMaster m_master;
private:
--
Gitblit v1.9.3