From 876ad153fd25c0605f516b0f3a6407999db69131 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 17 十二月 2024 16:46:37 +0800
Subject: [PATCH] 1. 完善配方列表模块，与对称轴交互 2. 双击修改配方描述 3.配方列表控件动态变化
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index b5aae05..bc96b29 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -205,6 +205,10 @@
void CAxisSettingsDlg::AdjustLabelFont(CBLLabel& label)
{
+ if (label.m_hWnd == nullptr) {
+ return;
+ }
+
// 鑾峰彇鎺т欢鐨勭煩褰㈠尯鍩�
CRect rect;
label.GetClientRect(&rect);
@@ -299,7 +303,6 @@
RecipeManager& recipeManager = RecipeManager::getInstance();
if (m_strRecipeName.IsEmpty() || !recipeManager.loadRecipe(std::string(CT2A(m_strRecipeName)))) {
AfxMessageBox(_T("鍔犺浇閰嶆柟澶辫触锛�"));
- recipeManager.saveRecipe(std::string(CT2A(m_strRecipeName)));
return;
}
@@ -1253,7 +1256,7 @@
handleAxisOperation(AxisOperationType::POSITION_1, true);
Sleep(200);
handleAxisOperation(AxisOperationType::POSITION_1, false);
- m_pBlBtns[BTN_POINT1]->Flash(1000);
+ m_pBlBtns[BTN_POINT1]->Flash(500);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
@@ -1428,7 +1431,7 @@
if (m_nBtnsFlashState6 & 0x01) {
// 06.0
if (!m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
- m_pBlBtns[BTN_JOG_OPR]->Flash(1000);
+ m_pBlBtns[BTN_JOG_OPR]->Flash(500);
}
}
else if (m_nBtnsFlashState8 & 0x01) {
@@ -1444,7 +1447,7 @@
if (m_nBtnsFlashState6 & v) {
if (!m_pBlBtns[BTN_POINT1]->IsFlash()) {
- m_pBlBtns[BTN_POINT1]->Flash(1000);
+ m_pBlBtns[BTN_POINT1]->Flash(500);
}
}
else if (m_nBtnsFlashState8 & v) {
@@ -1455,7 +1458,7 @@
if (m_nBtnsFlashState6 & (v << 1)) {
if (!m_pBlBtns[BTN_POINT2]->IsFlash()) {
- m_pBlBtns[BTN_POINT2]->Flash(1000);
+ m_pBlBtns[BTN_POINT2]->Flash(500);
}
}
else if (m_nBtnsFlashState8 & (v << 1)) {
@@ -1466,7 +1469,7 @@
if (m_nBtnsFlashState6 & (v << 2)) {
if (!m_pBlBtns[BTN_POINT3]->IsFlash()) {
- m_pBlBtns[BTN_POINT3]->Flash(1000);
+ m_pBlBtns[BTN_POINT3]->Flash(500);
}
}
else if (m_nBtnsFlashState8 & (v << 2)) {
@@ -1477,7 +1480,7 @@
if (m_nBtnsFlashState6 & (v << 3)) {
if (!m_pBlBtns[BTN_POINT4]->IsFlash()) {
- m_pBlBtns[BTN_POINT4]->Flash(1000);
+ m_pBlBtns[BTN_POINT4]->Flash(500);
}
}
else if (m_nBtnsFlashState8 & (v << 3)) {
@@ -1488,7 +1491,7 @@
if (m_nBtnsFlashState6 & (v << 4)) {
if (!m_pBlBtns[BTN_POINT5]->IsFlash()) {
- m_pBlBtns[BTN_POINT5]->Flash(1000);
+ m_pBlBtns[BTN_POINT5]->Flash(500);
}
}
else if (m_nBtnsFlashState8 & (v << 4)) {
--
Gitblit v1.9.3