Merge pull request #223 from fasiondog/bugfix

fixed TradeRecord 在 python 交互环境下打印输出错误
fasiondog · Apr 5, 2024 · c698cb1 · c698cb1
2 parents 433ebe4 + f5b9999
commit c698cb1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/hikyuu/__init__.py b/hikyuu/__init__.py
@@ -87,6 +87,10 @@ def close():
         close_ostream_to_python()
 
 
+if in_interactive_session():
+    set_python_in_interactive(True)
+
+
 # 如果是在 jupyter 环境中运行，重定向C++ stdout/stderr输出至python
 if in_ipython_frontend():
     set_python_in_jupyter(True)

diff --git a/hikyuu_cpp/hikyuu/global/sysinfo.cpp b/hikyuu_cpp/hikyuu/global/sysinfo.cpp
@@ -25,8 +25,9 @@ using json = nlohmann::json;
 namespace hku {
 
 std::atomic<int> g_latest_version{0};
-std::atomic_bool g_runningInPython{false};  // 是否是在 python 中运行
-std::atomic_bool g_pythonInJupyter{false};  // python 是否为交互模式
+bool g_runningInPython{false};      // 是否是在 python 中运行
+bool g_pythonInInteractive{false};  // python 是否运行在交互模式下
+bool g_pythonInJupyter{false};      // python 是否运行在 Jupyter中
 
 bool HKU_API runningInPython() {
     return g_runningInPython;
@@ -36,6 +37,14 @@ void HKU_API setRunningInPython(bool inpython) {
     g_runningInPython = inpython;
 }
 
+bool HKU_API pythonInInteractive() {
+    return g_pythonInInteractive;
+}
+
+void HKU_API setPythonInInteractive(bool interactive) {
+    g_pythonInInteractive = interactive;
+}
+
 bool HKU_API pythonInJupyter() {
     return g_pythonInJupyter;
 }

diff --git a/hikyuu_cpp/hikyuu/global/sysinfo.h b/hikyuu_cpp/hikyuu/global/sysinfo.h
@@ -52,8 +52,15 @@ bool HKU_API runningInPython();
 /** 当前是否运行在 Jupyter 环境中 */
 bool HKU_API pythonInJupyter();
 
+/** python 是否运行在交互模式下 */
+bool HKU_API pythonInInteractive();
+
+/** 设置是否运行在 python 下*/
 void HKU_API setRunningInPython(bool inpython);
 
+/** 设置 python 是否运行在交互模式下 */
+void HKU_API setPythonInInteractive(bool interactive);
+
 /** 当前是否运行在 Jupyter 环境中 */
 void HKU_API setPythonInJupyter(bool injupyter);
 

diff --git a/hikyuu_cpp/hikyuu/trade_manage/TradeRecord.cpp b/hikyuu_cpp/hikyuu/trade_manage/TradeRecord.cpp
@@ -127,7 +127,7 @@ string TradeRecord::toString() const {
 
 #if HKU_OS_WINDOWS
     return fmt::format("Trade({}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})", datetime,
-                       market_code, runningInPython() && pythonInJupyter() ? name : UTF8ToGB(name),
+                       market_code, pythonInInteractive() ? name : UTF8ToGB(name),
                        getBusinessName(business), planPrice, realPrice, goalPrice, number,
                        cost.commission, cost.stamptax, cost.transferfee, cost.others,
                        getSystemPartName(from));

diff --git a/hikyuu_pywrap/main.cpp b/hikyuu_pywrap/main.cpp
@@ -108,6 +108,7 @@ PYBIND11_MODULE(core, m) {
     export_io_redirect(m);
 
     m.def("set_python_in_jupyter", setPythonInJupyter);
+    m.def("set_python_in_interactive", setPythonInInteractive);
 
     m.def("close_spend_time", close_spend_time, "全局关闭 c++ 部分耗时打印");
     m.def("open_spend_time", close_spend_time, "全局开启 c++ 部分耗时打印");