3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 00:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add more logs for debugging

Browse source 
Change-Id: I420e6e60901a32cc378c09ed57fba2ee1ac688df
This commit is contained in:
lane.wei 2022-07-26 12:23:21 +08:00 • committed by Lane.Wei
parent 0d1242d9c6
commit 4d52b8a44a
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/WebGuideDialog.cpp
View file

@ -109,15 +109,18 @@ GuideFrame::~GuideFrame()
void GuideFrame::load_url(wxString &url) void GuideFrame::load_url(wxString &url)
{ {
BOOST_LOG_TRIVIAL(trace) << "app_start: GuideFrame url=" << url.ToStdString(); BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< " enter, url=" << url.ToStdString();
this->Show(); this->Show();
WebView::LoadUrl(m_browser, url); WebView::LoadUrl(m_browser, url);
m_browser->SetFocus(); m_browser->SetFocus();
UpdateState(); UpdateState();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< " exit";
} }
wxString GuideFrame::SetStartPage(GuidePage startpage, bool load) wxString GuideFrame::SetStartPage(GuidePage startpage, bool load)
{ {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(" enter, load=%1%, start_page=%2%")%load%int(startpage);
//wxLogMessage("GUIDE: webpage_1 %s", (boost::filesystem::path(resources_dir()) / "web\\guide\\1\\index.html").make_preferred().string().c_str() ); //wxLogMessage("GUIDE: webpage_1 %s", (boost::filesystem::path(resources_dir()) / "web\\guide\\1\\index.html").make_preferred().string().c_str() );
wxString TargetUrl = from_u8( (boost::filesystem::path(resources_dir()) / "web/guide/1/index.html").make_preferred().string() ); wxString TargetUrl = from_u8( (boost::filesystem::path(resources_dir()) / "web/guide/1/index.html").make_preferred().string() );
//wxLogMessage("GUIDE: webpage_2 %s", TargetUrl.mb_str()); //wxLogMessage("GUIDE: webpage_2 %s", TargetUrl.mb_str());
@ -153,6 +156,7 @@ wxString GuideFrame::SetStartPage(GuidePage startpage, bool load)
} }
std::string strlang = wxGetApp().app_config->get("language"); std::string strlang = wxGetApp().app_config->get("language");
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(", strlang=%1%")%strlang;
if (strlang != "") if (strlang != "")
TargetUrl = wxString::Format("%s?lang=%s", w2s(TargetUrl), strlang); TargetUrl = wxString::Format("%s?lang=%s", w2s(TargetUrl), strlang);
@ -160,6 +164,7 @@ wxString GuideFrame::SetStartPage(GuidePage startpage, bool load)
if (load) if (load)
load_url(TargetUrl); load_url(TargetUrl);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< " exit";
return TargetUrl; return TargetUrl;
} }
@ -353,8 +358,8 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
} }
this->EndModal(wxID_OK); this->EndModal(wxID_OK);
if (InstallNetplugin) if (InstallNetplugin)
GUI::wxGetApp().CallAfter([this] { GUI::wxGetApp().ShowDownNetPluginDlg(); }); GUI::wxGetApp().CallAfter([this] { GUI::wxGetApp().ShowDownNetPluginDlg(); });
if (bLogin) if (bLogin)
@ -365,7 +370,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
this->Close(); this->Close();
} else if (strCmd == "save_region") { } else if (strCmd == "save_region") {
m_Region = j["region"]; m_Region = j["region"];
} }
else if (strCmd == "network_plugin_install") { else if (strCmd == "network_plugin_install") {
std::string sAction = j["data"]["action"]; std::string sAction = j["data"]["action"];
@ -925,7 +930,7 @@ int GuideFrame::LoadProfile()
//----region //----region
m_Region = wxGetApp().app_config->get("region"); m_Region = wxGetApp().app_config->get("region");
m_ProfileJson["region"] = m_Region; m_ProfileJson["region"] = m_Region;
m_ProfileJson["network_plugin_install"] = wxGetApp().app_config->get("app","installed_networking"); m_ProfileJson["network_plugin_install"] = wxGetApp().app_config->get("app","installed_networking");
m_ProfileJson["network_plugin_compability"] = wxGetApp().is_compatibility_version() ? "1" : "0"; m_ProfileJson["network_plugin_compability"] = wxGetApp().is_compatibility_version() ? "1" : "0";
} }

8
src/slic3r/Utils/NetworkAgent.cpp
View file

@ -141,7 +141,9 @@ int NetworkAgent::initialize_network_module()
library = std::string("lib") + BAMBU_NETWORK_LIBRARY + ".so"; library = std::string("lib") + BAMBU_NETWORK_LIBRARY + ".so";
#endif*/ #endif*/
//netwoking_module = dlopen( library.c_str(), RTLD_LAZY); //netwoking_module = dlopen( library.c_str(), RTLD_LAZY);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", error, dlerror is %1%")%dlerror(); char* dll_error = dlerror();
printf("error, dlerror is %s\n", dll_error);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", error, dlerror is %1%")%dll_error;
} }
printf("after dlopen, network_module is %p\n", netwoking_module); printf("after dlopen, network_module is %p\n", netwoking_module);
#endif #endif
@ -383,13 +385,13 @@ std::string NetworkAgent::get_version()
#endif #endif
} }
if (!consistent) { if (!consistent) {
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", inconsistent library，return 00.00.00.00!"); BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", inconsistent library,return 00.00.00.00!");
return "00.00.00.00"; return "00.00.00.00";
} }
if (get_version_ptr) { if (get_version_ptr) {
return get_version_ptr(); return get_version_ptr();
} }
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", get_version not supported，return 00.00.00.00!"); BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", get_version not supported,return 00.00.00.00!");
return "00.00.00.00"; return "00.00.00.00";
} }