From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ToolUnits.cpp | 65 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.cpp b/SourceCode/Bond/Servo/ToolUnits.cpp
index 6d5df0d..e3e1dca 100644
--- a/SourceCode/Bond/Servo/ToolUnits.cpp
+++ b/SourceCode/Bond/Servo/ToolUnits.cpp
@@ -7,6 +7,8 @@
#include <ctime>
#include <iomanip>
#include <sstream>
+#include <vector>
+#include <cstdarg>
CToolUnits::CToolUnits()
{
@@ -574,4 +576,65 @@
std::ostringstream oss;
oss << std::put_time(&tm, "%Y%m%d%H%M%S"); // 例：2025-09-15 08:23:07
return oss.str();
-}
\ No newline at end of file
+}
+
+std::wstring CToolUnits::AnsiToWString(const std::string& str)
+{
+ if (str.empty()) return std::wstring();
+
+ int len = ::MultiByteToWideChar(CP_ACP, 0,
+ str.c_str(), -1,
+ nullptr, 0);
+ if (len <= 0) return std::wstring();
+
+ std::wstring ws;
+ ws.resize(len - 1);
+
+ ::MultiByteToWideChar(CP_ACP, 0,
+ str.c_str(), -1,
+ &ws[0], len);
+
+ return ws;
+}
+
+std::string CToolUnits::WStringToAnsi(const std::wstring& wstr)
+{
+ if (wstr.empty()) return std::string();
+
+ int len = ::WideCharToMultiByte(CP_ACP, 0,
+ wstr.c_str(), -1,
+ nullptr, 0,
+ nullptr, nullptr);
+ if (len <= 0) return std::string();
+
+ std::string str;
+ str.resize(len - 1);
+
+ ::WideCharToMultiByte(CP_ACP, 0,
+ wstr.c_str(), -1,
+ &str[0], len,
+ nullptr, nullptr);
+
+ return str;
+}
+std::string CToolUnits::formatString(const char* fmt, ...)
+{
+ if (fmt == nullptr) return std::string();
+
+ char buf[512] = {0};
+ va_list args;
+ va_start(args, fmt);
+ int n = _vsnprintf_s(buf, sizeof(buf), _TRUNCATE, fmt, args);
+ va_end(args);
+
+ if (n >= 0 && n < (int)sizeof(buf)) {
+ return std::string(buf);
+ }
+
+ // ?????????????????
+ std::vector<char> tmp((n > 0 ? n + 2 : 1024), 0);
+ va_start(args, fmt);
+ _vsnprintf_s(tmp.data(), tmp.size(), _TRUNCATE, fmt, args);
+ va_end(args);
+ return std::string(tmp.data());
+}
--
Gitblit v1.9.3