From abeaf384ca65153fa9c66f8953cd0f68ad5f9f9f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 11 十一月 2025 11:23:42 +0800
Subject: [PATCH] 1.曲线图前烘拆分为AB腔。 2.曲线图后烘拆分为AB腔。
---
SourceCode/Bond/Servo/Model.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 8d987b6..8530738 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -49,12 +49,18 @@
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,
+ m_master.setPortTypeEx(i, portEnable, portType, portMode, cassetteType,
transferMode, autoChangeEnable);
int seed = m_configuration.getPortCassetteSnSeed(i + 1);
m_master.setPortCassetteSnSeed(i + 1, seed);
}
+}
+
+void CModel::setPortType(unsigned int index, SERVO::PortType type)
+{
+ m_master.setPortType(index, (int)type);
+ m_configuration.setPortType(index, (int)type);
}
void CModel::setPortCassetteType(unsigned int index, SERVO::CassetteType type)
@@ -468,9 +474,8 @@
// 加截Job
strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
std::string strPath = std::string((LPTSTR)(LPCTSTR)strMasterDataFile);
- if (!m_master.loadState(strPath)) {
- LOGE("<Master>加载MasterState.dat文件失败.");
- }
+ m_master.setStateFile(strPath);
+
// 加载警告信息
--
Gitblit v1.9.3