diff --git a/src/slic3r/Utils/NetworkAgent.cpp b/src/slic3r/Utils/NetworkAgent.cpp index 9344f4bc98..d55d5d5d19 100644 --- a/src/slic3r/Utils/NetworkAgent.cpp +++ b/src/slic3r/Utils/NetworkAgent.cpp @@ -105,6 +105,7 @@ func_track_enable NetworkAgent::track_enable_ptr = nullptr; func_track_event NetworkAgent::track_event_ptr = nullptr; func_track_header NetworkAgent::track_header_ptr = nullptr; func_track_update_property NetworkAgent::track_update_property_ptr = nullptr; +func_track_get_property NetworkAgent::track_get_property_ptr = nullptr; NetworkAgent::NetworkAgent() @@ -256,6 +257,7 @@ int NetworkAgent::initialize_network_module(bool using_backup) track_event_ptr = reinterpret_cast(get_network_function("bambu_network_track_event")); track_header_ptr = reinterpret_cast(get_network_function("bambu_network_track_header")); track_update_property_ptr = reinterpret_cast(get_network_function("bambu_network_track_update_property")); + track_get_property_ptr = reinterpret_cast(get_network_function("bambu_network_track_get_property")); return 0; } @@ -360,6 +362,7 @@ int NetworkAgent::unload_network_module() track_event_ptr = nullptr; track_header_ptr = nullptr; track_update_property_ptr = nullptr; + track_get_property_ptr = nullptr; return 0; } @@ -1252,4 +1255,18 @@ int NetworkAgent::track_update_property(std::string name, std::string value, std return ret; } +int NetworkAgent::track_get_property(std::string name, std::string& value, std::string type) +{ + if (!this->enable_track) + return 0; + + int ret = 0; + if (network_agent && track_get_property_ptr) { + ret = track_get_property_ptr(network_agent, name, value, type); + if (ret) + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format("error network_agnet=%1%, ret = %2%") % network_agent % ret; + } + return ret; +} + } //namespace diff --git a/src/slic3r/Utils/NetworkAgent.hpp b/src/slic3r/Utils/NetworkAgent.hpp index 1a8b727db5..2536ada99a 100644 --- a/src/slic3r/Utils/NetworkAgent.hpp +++ b/src/slic3r/Utils/NetworkAgent.hpp @@ -85,6 +85,7 @@ typedef int (*func_track_enable)(void *agent, bool enable); typedef int (*func_track_event)(void *agent, std::string evt_key, std::string content); typedef int (*func_track_header)(void *agent, std::string header); typedef int (*func_track_update_property)(void *agent, std::string name, std::string value, std::string type); +typedef int (*func_track_get_property)(void *agent, std::string name, std::string& value, std::string type); //the NetworkAgent class @@ -178,6 +179,7 @@ public: int track_event(std::string evt_key, std::string content); int track_header(std::string header); int track_update_property(std::string name, std::string value, std::string type = "string"); + int track_get_property(std::string name, std::string& value, std::string type = "string"); bool get_track_enable() { return enable_track; } private: bool enable_track = false; @@ -261,6 +263,7 @@ private: static func_track_event track_event_ptr; static func_track_header track_header_ptr; static func_track_update_property track_update_property_ptr; + static func_track_get_property track_get_property_ptr; }; } diff --git a/version.inc b/version.inc index 2fd4b1bd6e..d0d7a81a8b 100644 --- a/version.inc +++ b/version.inc @@ -12,4 +12,4 @@ set(BBL_INTERNAL_TESTING "1") endif() # The build_version should start from 50 in master branch -set(SLIC3R_VERSION "01.07.00.66") +set(SLIC3R_VERSION "01.07.01.51")