From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期四, 26 六月 2025 08:46:11 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/BondEq/ToolUnits.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/BondEq/ToolUnits.h b/SourceCode/Bond/BondEq/ToolUnits.h index ad88f75..9e8fdfb 100644 --- a/SourceCode/Bond/BondEq/ToolUnits.h +++ b/SourceCode/Bond/BondEq/ToolUnits.h @@ -20,9 +20,13 @@ static std::string getCurrentExePath(); static bool isFile(const std::string& path); static bool isDirectory(const std::string& path); - static double toInt32(const char* pBuffer); - static double toInt16(const char* pBuffer); + static int toInt32(const char* pBuffer); + static int toInt16(const char* pBuffer); static BOOL getBit(const char c, int index); + static void setBit(char* p, int index); static void setDlgItemDouble(CWnd* pWnd, int nCtrlId, double value); + static std::vector<CString> GetFileNamesInDirectory(const CString& strFolderPath, const CString& strExtension); + static std::string getRecipePath(); + static std::string getCurrentTimeString(); }; -- Gitblit v1.9.3