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.cpp | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index e39f62d..27056bd 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -40,6 +40,18 @@
m_strWorkDir = pszWorkDir;
}
+void CModel::loadPortParams()
+{
+ BOOL portEnable, autoChangeEnable;
+ int portType, portMode, cassetteType, transferMode;
+ for (int i = 0; i < 4; i++) {
+ m_configuration.getPortParms(i, portEnable, portType, portMode,
+ cassetteType, transferMode, autoChangeEnable);
+ m_master.setPortType(i, portEnable, portType, portMode, cassetteType,
+ transferMode, autoChangeEnable);
+ }
+}
+
int CModel::init()
{
CString strIniFile;
@@ -188,7 +200,6 @@
break;
case ROBOT_EVENT_FINISH:
LOGI("<CModel>onRobotTaskEvent: 任务完成(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
- pTask->completed();
break;
case ROBOT_EVENT_ERROR:
LOGE("<CModel>onRobotTaskEvent: 任务错误(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
@@ -233,7 +244,7 @@
// 状态映射
static const char* STATUS_STR[] = {
- "Unknown", "Ready", "Running", "Error", "Abort", "Completed"
+ "Unknown", "Ready", "Running", "Picking", "Placing", "Restoring", "Error", "Abort", "Completed"
};
auto state = pTask->getState();
int index = static_cast<int>(state);
--
Gitblit v1.9.3