From d119dcff794370b1852c0e9a3cda28d8d2bc6ae8 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 五月 2025 17:24:51 +0800
Subject: [PATCH] 1. 添加搬运记录对话框 2. 修复搬运记录的数据库管理类的中文问题
---
SourceCode/Bond/Servo/CRobotCmdTestDlg.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotCmdTestDlg.cpp b/SourceCode/Bond/Servo/CRobotCmdTestDlg.cpp
index 28a62e6..0a41147 100644
--- a/SourceCode/Bond/Servo/CRobotCmdTestDlg.cpp
+++ b/SourceCode/Bond/Servo/CRobotCmdTestDlg.cpp
@@ -14,7 +14,7 @@
#define LOG_COLOR_TIME RGB(0, 0, 255) // 鏃堕棿鎴筹細钃濊壊
// 蹇嵎鍛戒护鏄犲皠琛�
-std::map<CString, QuickCmdFieldMask> g_quickCmdMap = {
+std::map<CString, QuickCmdFieldMask> g_mapQuickCmd = {
{_T("SendHome"), {false, false, false, false, false}},
{_T("SendTransfer"), {true, true, true, true, true }},
{_T("SendMoveToGet"), {true, true, true, false, false}},
@@ -76,14 +76,14 @@
// TODO: 鍦ㄦ娣诲姞棰濆鐨勫垵濮嬪寲
// 鍒濆鍖栧懡浠ょ粍鍚堝垪琛�
- for (const auto& pair : g_quickCmdMap) {
+ for (const auto& pair : g_mapQuickCmd) {
m_comboCmdType.AddString(pair.first);
}
m_comboCmdType.SetCurSel(0);
// 鍒濆鍖栧懡浠よ緭鍏ユ帶浠�
- if (!g_quickCmdMap.empty()) {
- UpdateCommandInputUI(g_quickCmdMap.begin()->first);
+ if (!g_mapQuickCmd.empty()) {
+ UpdateCommandInputUI(g_mapQuickCmd.begin()->first);
}
// 鍒濆鍖� Arm No锛�1锛欰rm#1锛�2锛欰rm#2锛�
@@ -197,8 +197,9 @@
void CRobotCmdTestDlg::UpdateCommandInputUI(const CString& cmdName)
{
- auto it = g_quickCmdMap.find(cmdName);
- if (it == g_quickCmdMap.end()) {
+ auto it = g_mapQuickCmd.find(cmdName);
+ if (it == g_mapQuickCmd.end()) {
+ AppendLogLineRichStyled(_T("鏈煡鐨勫懡浠ょ被鍨�"), LOG_COLOR_ERROR);
return;
}
@@ -274,7 +275,6 @@
long nStart = 0;
long nEnd = m_editLog.GetTextLength();
- CHARRANGE cr;
FINDTEXTEX ft = { 0 };
ft.chrg.cpMin = 0;
ft.chrg.cpMax = nEnd;
--
Gitblit v1.9.3