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

ENH:export system and graphics cart info to log 

jira:none
code is from PrusaSlicer,thanks for PrusaSlicer and Lukas Matena
commit e04e8c55cfc0498bb665f6fb515f3a8fcea64796
Author: Lukas Matena <lukasmatena@seznam.cz>
Date:   Fri Dec 2 14:21:18 2022 +0100

    Improved performance of GLModel::render:
    The way the OpenGL version was checked was quite inefficient

Change-Id: I6d7c6678e383c5cf2fbfea5b61ef65beab5328f9
This commit is contained in:
zhou.xu 2024-12-27 17:59:48 +08:00 committed by lane.wei
parent 2e1f86766d
commit 3e938c9216
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2541,6 +2541,29 @@ class wxBoostLog : public wxLog
} }
}; };
std::string get_system_info()
{
std::stringstream out;
std::string b_start = "";
std::string b_end = "";
std::string line_end = "\n";
out << b_start << "Operating System: " << b_end << wxPlatformInfo::Get().GetOperatingSystemFamilyName() << line_end;
out << b_start << "System Architecture: " << b_end << wxPlatformInfo::Get().GetBitnessName() << line_end;
out << b_start <<
#if defined _WIN32
"Windows Version: "
#else
// Hopefully some kind of unix / linux.
"System Version: "
#endif
<< b_end << wxPlatformInfo::Get().GetOperatingSystemDescription() << line_end;
out << b_start << "Total RAM size [MB]: " << b_end << Slic3r::format_memsize_MB(Slic3r::total_physical_memory());
return out.str();
}
bool GUI_App::on_init_inner() bool GUI_App::on_init_inner()
{ {
wxLog::SetActiveTarget(new wxBoostLog()); wxLog::SetActiveTarget(new wxBoostLog());
@ -2600,6 +2623,7 @@ bool GUI_App::on_init_inner()
#endif #endif
BOOST_LOG_TRIVIAL(info) << boost::format("gui mode, Current BambuStudio Version %1%")%SLIC3R_VERSION; BOOST_LOG_TRIVIAL(info) << boost::format("gui mode, Current BambuStudio Version %1%")%SLIC3R_VERSION;
BOOST_LOG_TRIVIAL(info) << get_system_info();
// Enable this to get the default Win32 COMCTRL32 behavior of static boxes. // Enable this to get the default Win32 COMCTRL32 behavior of static boxes.
// wxSystemOptions::SetOption("msw.staticbox.optimized-paint", 0); // wxSystemOptions::SetOption("msw.staticbox.optimized-paint", 0);
// Enable this to disable Windows Vista themes for all wxNotebooks. The themes seem to lead to terrible // Enable this to disable Windows Vista themes for all wxNotebooks. The themes seem to lead to terrible
@ -4162,7 +4186,7 @@ std::string GUI_App::handle_web_request(std::string cmd)
CallAfter([this] { CallAfter([this] {
if (mainframe && this->app_config->get("staff_pick_switch") == "true") { if (mainframe && this->app_config->get("staff_pick_switch") == "true") {
if (mainframe->m_webview) { mainframe->m_webview->SendDesignStaffpick(has_model_mall()); } if (mainframe->m_webview) { mainframe->m_webview->SendDesignStaffpick(has_model_mall()); }
} }
}); });
} }
else if (command_str.compare("modelmall_model_open") == 0) { else if (command_str.compare("modelmall_model_open") == 0) {
@ -4286,7 +4310,7 @@ std::string GUI_App::handle_web_request(std::string cmd)
else if (command_str.compare("homepage_makerlab_get") == 0) { else if (command_str.compare("homepage_makerlab_get") == 0) {
CallAfter([this] { CallAfter([this] {
if (mainframe && mainframe->m_webview) { mainframe->m_webview->SendMakerlabList(); } if (mainframe && mainframe->m_webview) { mainframe->m_webview->SendMakerlabList(); }
}); });
} }
else if (command_str.compare("homepage_makerlab_open") == 0) { else if (command_str.compare("homepage_makerlab_open") == 0) {
if (root.get_child_optional("url") != boost::none) { if (root.get_child_optional("url") != boost::none) {
@ -4354,7 +4378,7 @@ std::string GUI_App::handle_web_request(std::string cmd)
else if (command_str.compare("homepage_printhistory_get")==0) else if (command_str.compare("homepage_printhistory_get")==0)
{ {
CallAfter([this] { CallAfter([this] {
if (mainframe && mainframe->m_webview) { mainframe->m_webview->ShowUserPrintTask(true); } if (mainframe && mainframe->m_webview) { mainframe->m_webview->ShowUserPrintTask(true); }
}); });
} }
else if (command_str.compare("homepage_leftmenu_change_width") == 0) { else if (command_str.compare("homepage_leftmenu_change_width") == 0) {

2
src/slic3r/GUI/OpenGLManager.cpp
View File

@ -116,7 +116,7 @@ void OpenGLManager::GLInfo::detect() const
*const_cast<std::string*>(&m_vendor) = gl_get_string_safe(GL_VENDOR, "N/A"); *const_cast<std::string*>(&m_vendor) = gl_get_string_safe(GL_VENDOR, "N/A");
*const_cast<std::string*>(&m_renderer) = gl_get_string_safe(GL_RENDERER, "N/A"); *const_cast<std::string*>(&m_renderer) = gl_get_string_safe(GL_RENDERER, "N/A");
BOOST_LOG_TRIVIAL(info) << boost::format("got opengl version %1%, glsl version %2%, vendor %3%")%m_version %m_glsl_version %m_vendor<< std::endl; BOOST_LOG_TRIVIAL(info) << boost::format("got opengl version %1%, glsl version %2%, vendor %3% , graphics card model %4%") % m_version % m_glsl_version % m_vendor % m_renderer << std::endl;
int* max_tex_size = const_cast<int*>(&m_max_tex_size); int* max_tex_size = const_cast<int*>(&m_max_tex_size);
glsafe(::glGetIntegerv(GL_MAX_TEXTURE_SIZE, max_tex_size)); glsafe(::glGetIntegerv(GL_MAX_TEXTURE_SIZE, max_tex_size));