From c6edbd1df725b75f0b1ed97ca178ea4e3231b25f Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 09 十二月 2024 14:18:11 +0800
Subject: [PATCH] 1. axis设定先写入PLC，间隔2秒后更新界面和配方 2. IO模块如果是可以点击的信号，移动到控件上鼠标显示点击图标 3. io模块添加圆角功能
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index c240ab3..4b4027d 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -1294,15 +1294,20 @@
if (ret != IDOK) {
return;
}
+ writeAxisDataToPLC(axisId);
- updateDataFromUI(axisId);
+ Sleep(2000);
+
+ refreshAxisDetails(axisId);
+ refreshPositionDetails(axisId, m_currentPage);
if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
- writeAxisDataToPLC(axisId);
- cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鎴愬姛锛�"), axisId);
+ cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鍒版枃浠舵垚鍔燂紒"), axisId);
SystemLogManager::getInstance().log(SystemLogManager::LogType::Operation, std::string(CT2A(cstrMessage)));
+
+ updateDataFromUI(axisId);
}
else {
- cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟澶辫触锛�"), axisId);
+ cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鍒版枃浠跺け璐ワ紒"), axisId);
SystemLogManager::getInstance().log(SystemLogManager::LogType::Error, std::string(CT2A(cstrMessage)));
}
@@ -1321,9 +1326,6 @@
// 鏇存柊Labels鐘舵��
UpdateLabels();
-
- // 鏇存柊瀹氫綅鐐�
- //refreshPositionDetails(getCurrentSelectedAxisID(), m_currentPage);
// OPR鎸夐挳鏄惁瑕侀棯鐑佹垨鍋滄闂儊
// 06.0鍜�08.0
--
Gitblit v1.9.3