From fb98a219007778cd199030ef89c7848c7f8022dd Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 23 七月 2025 16:14:59 +0800
Subject: [PATCH] 1. 优化设备配方绑定界面； 2. 获取设备的配方列表，并显示在下拉框中。
---
SourceCode/Bond/Servo/Model.cpp | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 6c36c56..7f3ed76 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -52,6 +52,12 @@
}
}
+void CModel::setPortCassetteType(unsigned int index, SERVO::CassetteType type)
+{
+ m_master.setPortCassetteType(index, type);
+ m_configuration.setPortCassetteType(index, (int)type);
+}
+
int CModel::init()
{
CString strIniFile;
@@ -274,6 +280,10 @@
notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
};
+ masterListener.onLoadPortInUse = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short scanMap) {
+ LOGE("<CModel>onLoadPortInUse. scanMap = %d", scanMap);
+ notifyPtr(RX_CODE_LOADPORT_INUSE, pEquipment);
+ };
m_master.setListener(masterListener);
@@ -281,7 +291,7 @@
CString strMasterDataFile;
strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
-
+ m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
// 加载警告信息
AlarmManager& alarmManager = AlarmManager::getInstance();
--
Gitblit v1.9.3