From 5cf5e464a5891c8eb62aafadfce0d204fdc79b02 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 22 五月 2025 13:50:02 +0800
Subject: [PATCH] 1. 添加机械臂快速测试界面
---
SourceCode/Bond/Servo/Model.cpp | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 0c50bac..14e2af9 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -5,6 +5,7 @@
#include "ToolUnits.h"
#include "CEqAlarmStep.h"
#include "AlarmManager.h"
+#include "CGlassPool.h"
CModel::CModel()
@@ -19,6 +20,12 @@
IObservable* CModel::getObservable()
{
+ if (m_pObservable == nullptr) {
+ m_pObservable = RX_AllocaObservable([&](IObservableEmitter* e) -> void {
+ m_pObservableEmitter = e; // 保存发射器
+ });
+ }
+
return m_pObservable;
}
@@ -40,6 +47,9 @@
CString strSoftRev = _T("1.0.2");
+ // CGlassPool
+ m_glassPool.initPool();
+
// Log
CString strLogDir;
@@ -53,11 +63,6 @@
CLog::GetLog()->SetLogsDir(strLogDir);
CLog::GetLog()->SetEquipmentId((LPTSTR)(LPCTSTR)strUnitId);
LOGI("\r\n\r\n~~~ Prog Start! ~~~");
-
-
- m_pObservable = RX_AllocaObservable([&](IObservableEmitter* e) -> void {
- m_pObservableEmitter = e; // 保存发射器
- });
SECSListener listener;
@@ -181,6 +186,7 @@
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
m_master.term();
+ m_glassPool.term();
return 0;
}
--
Gitblit v1.9.3