mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH::modify some logs level 

jira:[for log]

Change-Id: I6a46b8fcd3a030b4b630e800fe9a9ac5c387f117
This commit is contained in:
tao wang 2024-01-15 18:24:34 +08:00 committed by Lane.Wei
parent f79a3aa069
commit 68b5cc6a49
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/DeviceManager.cpp
View File

@ -5035,12 +5035,12 @@ void DeviceManager::on_machine_alive(std::string json_str)
if (obj->dev_ip.compare(dev_ip) != 0) { if (obj->dev_ip.compare(dev_ip) != 0) {
if ( connection_name.empty() ) { if ( connection_name.empty() ) {
BOOST_LOG_TRIVIAL(info) << "MachineObject IP changed from " << obj->dev_ip << " to " << dev_ip; BOOST_LOG_TRIVIAL(info) << "MachineObject IP changed from " << Slic3r::GUI::wxGetApp().format_IP(obj->dev_ip) << " to " << Slic3r::GUI::wxGetApp().format_IP(dev_ip);
obj->dev_ip = dev_ip; obj->dev_ip = dev_ip;
} }
else { else {
if ( obj->dev_connection_name.empty() || obj->dev_connection_name.compare(connection_name) == 0) { if ( obj->dev_connection_name.empty() || obj->dev_connection_name.compare(connection_name) == 0) {
BOOST_LOG_TRIVIAL(info) << "MachineObject IP changed from " << obj->dev_ip << " to " << dev_ip << " connection_name is " << connection_name; BOOST_LOG_TRIVIAL(info) << "MachineObject IP changed from " << Slic3r::GUI::wxGetApp().format_IP(obj->dev_ip) << " to " << Slic3r::GUI::wxGetApp().format_IP(dev_ip) << " connection_name is " << connection_name;
if(obj->dev_connection_name.empty()){obj->dev_connection_name = connection_name;} if(obj->dev_connection_name.empty()){obj->dev_connection_name = connection_name;}
obj->dev_ip = dev_ip; obj->dev_ip = dev_ip;
} }
@ -5096,7 +5096,7 @@ void DeviceManager::on_machine_alive(std::string json_str)
}*/ }*/
BOOST_LOG_TRIVIAL(debug) << "SsdpDiscovery::New Machine, ip = " << dev_ip << ", printer_name= " << dev_name << ", printer_type = " << printer_type_str << ", signal = " << printer_signal; BOOST_LOG_TRIVIAL(info) << "SsdpDiscovery::New Machine, ip = " << Slic3r::GUI::wxGetApp().format_IP(dev_ip) << ", printer_name= " << dev_name << ", printer_type = " << printer_type_str << ", signal = " << printer_signal;
} }
} }
catch (...) { catch (...) {

18
src/slic3r/GUI/GUI_App.cpp
View File

@ -4504,6 +4504,24 @@ std::string GUI_App::format_display_version()
return version_display; return version_display;
} }
std::string GUI_App::format_IP(const std::string& ip)
{
std::string format_ip = ip;
size_t pos_st = 0;
size_t pos_en = 0;
for (int i = 0; i < 2; i++) {
pos_en = format_ip.find('.', pos_st + 1);
if (pos_en == std::string::npos) {
return ip;
}
format_ip.replace(pos_st, pos_en - pos_st, "***");
pos_st = pos_en + 1;
}
return format_ip;
}
void GUI_App::show_dialog(wxString msg) void GUI_App::show_dialog(wxString msg)
{ {
if (m_info_dialog_content.empty()) { if (m_info_dialog_content.empty()) {

1
src/slic3r/GUI/GUI_App.hpp
View File

@ -449,6 +449,7 @@ public:
void set_skip_version(bool skip = true); void set_skip_version(bool skip = true);
void no_new_version(); void no_new_version();
static std::string format_display_version(); static std::string format_display_version();
std::string format_IP(const std::string& ip);
void show_dialog(wxString msg); void show_dialog(wxString msg);
void reload_settings(); void reload_settings();
void remove_user_presets(); void remove_user_presets();