From e39befda0f7d4c49f23cdf4ca291233dcd157d27 Mon Sep 17 00:00:00 2001 From: alves Date: Fri, 9 Jan 2026 14:23:07 +0800 Subject: [PATCH 1/5] feature add parameter for print video. --- src/slic3r/GUI/ConfigManipulation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 367cd9d26a..b094f65ddc 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -846,7 +846,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co apply(config, &new_conf); } toggle_line("overhang_reverse_threshold", has_detect_overhang_wall && allow_overhang_reverse && has_overhang_reverse && !has_overhang_reverse_internal_only); - toggle_line("timelapse_type", is_BBL_Printer); + toggle_line("timelapse_type", true); bool have_small_area_infill_flow_compensation = config->opt_bool("small_area_infill_flow_compensation"); From 6b8b8b0e76b122c94b15badc8cde76f4598667f9 Mon Sep 17 00:00:00 2001 From: alves Date: Mon, 12 Jan 2026 14:50:37 +0800 Subject: [PATCH 2/5] feature crashpad need mac os 12.0 environment. --- CMakeLists.txt | 5 +++-- build_release_macos.sh | 2 +- deps/CMakeLists.txt | 5 +++-- src/dev-utils/platform/osx/Info.plist.in | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df6d220c1e..08855a48a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,9 +46,10 @@ You can do this in Environment Variables settings. endif () if (APPLE) - # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3 + # Require macOS 12.0+ (Monterey) as minimum version + # This ensures proper "requires macOS 12.0" system dialog instead of crash on older systems if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OS X deployment version" FORCE) endif () message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}") endif () diff --git a/build_release_macos.sh b/build_release_macos.sh index 16d86e36a5..5744cf21cf 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -82,7 +82,7 @@ if [ -z "$DEPS_CMAKE_GENERATOR" ]; then fi if [ -z "$OSX_DEPLOYMENT_TARGET" ]; then - export OSX_DEPLOYMENT_TARGET="11.3" + export OSX_DEPLOYMENT_TARGET="12.0" fi echo "Build params:" diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 4b0d02d2a8..c0cb5be71c 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -22,9 +22,10 @@ cmake_minimum_required(VERSION 3.2) if (APPLE) - # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3 + # Require macOS 12.0+ (Monterey) as minimum version + # All deps must use the same deployment target for consistent behavior if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OS X deployment version" FORCE) endif () message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}") diff --git a/src/dev-utils/platform/osx/Info.plist.in b/src/dev-utils/platform/osx/Info.plist.in index 5cb04bb0f8..d471724ee9 100644 --- a/src/dev-utils/platform/osx/Info.plist.in +++ b/src/dev-utils/platform/osx/Info.plist.in @@ -125,7 +125,7 @@ LSMinimumSystemVersion - 10.10 + 12.0 NSPrincipalClass NSApplication NSHighResolutionCapable From 4ff14ce96e8f517e03e5ba0a98384922122534e6 Mon Sep 17 00:00:00 2001 From: alves Date: Tue, 13 Jan 2026 16:07:52 +0800 Subject: [PATCH 3/5] feature add sub for privacy update flags for web control. --- src/slic3r/GUI/GUI_App.cpp | 21 +++++++++-- src/slic3r/GUI/GUI_App.hpp | 4 +-- src/slic3r/GUI/Preferences.cpp | 2 +- src/slic3r/GUI/SSWCP.cpp | 60 +++++++++++++++++++++++++++++-- src/slic3r/GUI/SSWCP.hpp | 4 +++ src/slic3r/GUI/WebGuideDialog.cpp | 2 +- 6 files changed, 85 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 905d9eaf6b..0d4ac1f262 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -7063,7 +7063,7 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage } auto isAgree = wxGetApp().app_config->get("app", "privacy_policy_isagree"); - set_privacy_policy(isAgree == "true"); + user_update_privacy_notify(isAgree == "true"); BOOST_LOG_TRIVIAL(warning) << "run_wizard changed the privacy policy with: " << (isAgree); return res; } @@ -7268,6 +7268,23 @@ void GUI_App::cache_notify(const std::string& key, const json& res) } } +void GUI_App::user_update_privacy_notify(const bool& res) +{ + set_privacy_policy(res); + + json data; + + data["privacy_policy_isagree"] = res; + + for (const auto& instance : m_user_update_privacy_subscribers) { + auto ptr = instance.second.lock(); + if (ptr) { + ptr->m_res_data = data; + ptr->send_to_js(); + } + } + +} void GUI_App::user_login_notify(const json& res) { @@ -7283,7 +7300,7 @@ void GUI_App::user_login_notify(const json& res) bool GUI_App::config_wizard_startup() { auto isAgree = wxGetApp().app_config->get("app", "privacy_policy_isagree"); - set_privacy_policy(isAgree == "true"); + user_update_privacy_notify(isAgree == "true"); BOOST_LOG_TRIVIAL(warning) << "config_wizard_startup changed the privacy policy with: " << (isAgree); if (!m_app_conf_exists || preset_bundle->printers.only_default_printers()) { BOOST_LOG_TRIVIAL(info) << "run wizard..."; diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index da12caa315..1607110598 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -834,7 +834,7 @@ public: std::unordered_map> m_user_login_subscribers; std::unordered_map> m_device_card_subscribers; std::unordered_map> m_page_state_subscribers; - + std::unordered_map> m_user_update_privacy_subscribers; struct CachePairCompare { bool operator()(const std::pair>& lhs, @@ -850,7 +850,7 @@ public: void device_card_notify(const json& res); void page_state_notify_webview(wxWebView* webview, const std::string& state); void cache_notify(const std::string& key, const json& res); - + void user_update_privacy_notify(const bool& res); public: bool sm_disconnect_current_machine(bool need_reload_printerview = true); diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 5909829264..7d83a7914f 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -752,7 +752,7 @@ wxBoxSizer *PreferencesDialog::create_item_checkbox(wxString title, wxWindow *pa { app_config->set("app", "privacy_policy_isagree", checkbox->GetValue()); BOOST_LOG_TRIVIAL(warning) <<"create_item_checkbox changed the privacy policy with: "<<(checkbox->GetValue()?"true" : "false"); - set_privacy_policy(checkbox->GetValue()); + wxGetApp().user_update_privacy_notify(checkbox->GetValue()); } // if (param == "staff_pick_switch") { // bool pbool = app_config->get("staff_pick_switch") == "true"; diff --git a/src/slic3r/GUI/SSWCP.cpp b/src/slic3r/GUI/SSWCP.cpp index 70364b2ad5..bd30ea6cfb 100644 --- a/src/slic3r/GUI/SSWCP.cpp +++ b/src/slic3r/GUI/SSWCP.cpp @@ -1175,6 +1175,7 @@ void SSWCP_Instance::sw_UnsubscribeAll() { wxGetApp().m_recent_file_subscribers.clear(); wxGetApp().m_user_login_subscribers.clear(); wxGetApp().m_cache_subscribers.clear(); + wxGetApp().m_user_update_privacy_subscribers.clear(); send_to_js(); finish_job(); @@ -1217,6 +1218,15 @@ void SSWCP_Instance::sw_Webview_Unsubscribe() { } } + auto& privacy_map = wxGetApp().m_user_update_privacy_subscribers; + for (auto iter = privacy_map.begin(); iter != privacy_map.end();) { + if (iter->first == m_webview) { + iter = privacy_map.erase(iter); + } else { + iter++; + } + } + send_to_js(); finish_job(); } @@ -1233,6 +1243,7 @@ void SSWCP_Instance::sw_Unsubscribe_Filter() { auto& device_map = wxGetApp().m_device_card_subscribers; auto& login_map = wxGetApp().m_user_login_subscribers; + auto& privacy_map = wxGetApp().m_user_update_privacy_subscribers; auto& recent_file_map = wxGetApp().m_recent_file_subscribers; auto& cache_map = wxGetApp().m_cache_subscribers; @@ -1271,6 +1282,23 @@ void SSWCP_Instance::sw_Unsubscribe_Filter() { } } + for (auto iter = privacy_map.begin(); iter != privacy_map.end();) { + if (iter->first == m_webview) { + auto ptr = iter->second.lock(); + if (ptr) { + if (ptr->m_event_id == event_id) { + iter = privacy_map.erase(iter); + } else { + iter++; + } + } else { + iter = privacy_map.erase(iter); + } + } else { + iter++; + } + } + for (auto iter = recent_file_map.begin(); iter != recent_file_map.end();) { if (iter->first == m_webview) { auto ptr = iter->second.lock(); @@ -1339,7 +1367,26 @@ void SSWCP_Instance::sw_Unsubscribe_Filter() { iter++; } } - } else if (cmd == "sw_SubscribeLocalDevices") { + } else if (cmd == UPDATE_PRIVACY_STATUS) { + + for (auto iter = privacy_map.begin(); iter != privacy_map.end();) { + if (iter->first == m_webview) { + auto ptr = iter->second.lock(); + if (ptr) { + if (event_id == "" || (event_id != "" && event_id == ptr->m_event_id)) { + iter = privacy_map.erase(iter); + } else { + iter++; + } + } else { + iter = privacy_map.erase(iter); + } + } else { + iter++; + } + } + + }else if (cmd == "sw_SubscribeLocalDevices") { for (auto iter = device_map.begin(); iter != device_map.end();) { if (iter->first == m_webview) { auto ptr = iter->second.lock(); @@ -1373,7 +1420,7 @@ void SSWCP_Instance::sw_Unsubscribe_Filter() { iter++; } } - } + } send_to_js(); finish_job(); @@ -5941,6 +5988,15 @@ void SSWCP::on_webview_delete(wxWebView* view) } } + auto& privacy_map = wxGetApp().m_user_update_privacy_subscribers; + for (auto iter = privacy_map.begin(); iter != privacy_map.end();) { + if (iter->first == view) { + iter = privacy_map.erase(iter); + } else { + iter++; + } + } + auto& recent_file_map = wxGetApp().m_recent_file_subscribers; for (auto iter = recent_file_map.begin(); iter != recent_file_map.end();) { if (iter->first == view) { diff --git a/src/slic3r/GUI/SSWCP.hpp b/src/slic3r/GUI/SSWCP.hpp index 19b8d89093..a8af7daa7e 100644 --- a/src/slic3r/GUI/SSWCP.hpp +++ b/src/slic3r/GUI/SSWCP.hpp @@ -23,6 +23,8 @@ using namespace nlohmann; namespace asio = boost::asio; using tcp = asio::ip::tcp; +#define UPDATE_PRIVACY_STATUS "sw_SubUserUpdatePrivacy" + namespace Slic3r { namespace GUI { class WCP_Logger @@ -525,6 +527,8 @@ private: void sw_SubscribeUserLoginState(); + void sw_SubUserUpdatePrivacy(); + }; // Instance class for homepage business diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 045a099a8e..f80b5761aa 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -651,7 +651,7 @@ int GuideFrame::SaveProfile() // m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "0"); m_MainPtr->app_config->set("app", "privacy_policy_isagree", PrivacyUse); BOOST_LOG_TRIVIAL(warning) << "SaveProfile changed the privacy policy with: " << (PrivacyUse ? "true" : "false"); - set_privacy_policy(PrivacyUse); + wxGetApp().user_update_privacy_notify(PrivacyUse); m_MainPtr->app_config->set("region", m_Region); m_MainPtr->app_config->set_bool("stealth_mode", StealthMode); From dab81c330bccdbc6647cf5ec99e64f6bc3edcca3 Mon Sep 17 00:00:00 2001 From: alves Date: Wed, 14 Jan 2026 09:26:54 +0800 Subject: [PATCH 4/5] feature when webview init fail and log it. --- src/slic3r/GUI/GUI_App.cpp | 9 +++-- src/slic3r/GUI/PrinterWebView.cpp | 2 +- src/slic3r/GUI/ReleaseNote.cpp | 12 +++++++ src/slic3r/GUI/WebDeviceDialog.cpp | 14 +++++++- src/slic3r/GUI/WebDownPluginDlg.hpp | 2 +- src/slic3r/GUI/WebGuideDialog.cpp | 35 +++++++------------ src/slic3r/GUI/WebPreprintDialog.cpp | 16 +++++++-- src/slic3r/GUI/WebPresetDialog.cpp | 35 +++++++------------ src/slic3r/GUI/WebSMUserLoginDialog.cpp | 46 +++++++------------------ src/slic3r/GUI/WebUrlDialog.cpp | 16 +++++++-- src/slic3r/GUI/WebUserLoginDialog.cpp | 44 +++++++---------------- 11 files changed, 110 insertions(+), 121 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 0d4ac1f262..172aec2f2f 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -4151,13 +4151,18 @@ wxString GUI_App::get_international_url(const wxString& origin_url) { string dark_mode = wxGetApp().app_config->get("dark_color_mode"); + auto isAgree = wxGetApp().app_config->get("app", "privacy_policy_isagree"); + std::string useAgree = (isAgree == "true" ? "1" : "0"); + if (baseUrl.find("?") != std::string::npos) { return baseUrl + wxString::FromUTF8("&locale=") + lang + wxString::FromUTF8("-") + region + - wxString::FromUTF8("&dark_mode=" + dark_mode); + wxString::FromUTF8("&dark_mode=" + dark_mode) + wxString::FromUTF8("&privacy_policy_isagree=" + useAgree); } else { return baseUrl + wxString::FromUTF8("?locale=") + lang + wxString::FromUTF8("-") + region + - wxString::FromUTF8("&dark_mode=" + dark_mode); + wxString::FromUTF8("&dark_mode=" + dark_mode) + wxString::FromUTF8("&privacy_policy_isagree=" + useAgree); } + + } bool GUI_App::is_user_login() diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 4a8c42edc6..9af9872799 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -183,7 +183,7 @@ void PrinterWebView::OnError(wxWebViewEvent &evt) e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(": error loading page %1% %2% %3% %4%") %evt.GetURL() %evt.GetTarget() %e %evt.GetString(); + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":PrinterWebView error loading page %1% %2% %3% %4%") %evt.GetURL() %evt.GetTarget() %e %evt.GetString(); } void PrinterWebView::OnLoaded(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 4889537145..42629f2ba7 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -445,6 +445,18 @@ void UpdateVersionDialog::OnTitleChanged(wxWebViewEvent& event) } void UpdateVersionDialog::OnError(wxWebViewEvent& event) { + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; + } + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":UpdateVersionDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e %event.GetString(); event.Skip(); } diff --git a/src/slic3r/GUI/WebDeviceDialog.cpp b/src/slic3r/GUI/WebDeviceDialog.cpp index 1ff52b0162..ba9b5f66d8 100644 --- a/src/slic3r/GUI/WebDeviceDialog.cpp +++ b/src/slic3r/GUI/WebDeviceDialog.cpp @@ -105,7 +105,19 @@ void WebDeviceDialog::OnDocumentLoaded(wxWebViewEvent &evt) void WebDeviceDialog::OnError(wxWebViewEvent &evt) { - wxLogError("Web View Error: %s", evt.GetString()); + auto e = "unknown error"; + switch (evt.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; + } + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebDeviceDialog error loading page %1% %2% %3% %4%") % evt.GetURL() % evt.GetTarget() % e %evt.GetString(); + } void WebDeviceDialog::OnScriptMessage(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/WebDownPluginDlg.hpp b/src/slic3r/GUI/WebDownPluginDlg.hpp index c05de098e5..1ecf1581ce 100644 --- a/src/slic3r/GUI/WebDownPluginDlg.hpp +++ b/src/slic3r/GUI/WebDownPluginDlg.hpp @@ -29,7 +29,7 @@ #include "GUI_App.hpp" namespace Slic3r { namespace GUI { - +//not use on snapmaker orca class DownPluginFrame : public wxDialog { public: diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index f80b5761aa..dc0f7ca493 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -596,32 +596,21 @@ void GuideFrame::OnRunScriptArrayWithEmulationLevel(wxCommandEvent &WXUNUSED(evt /** * Callback invoked when a loading error occurs */ -void GuideFrame::OnError(wxWebViewEvent &evt) +void GuideFrame::OnError(wxWebViewEvent& event) { -#define WX_ERROR_CASE(type) \ - case type: category = #type; break; - - wxString category; - switch (evt.GetInt()) { - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CONNECTION); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CERTIFICATE); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_AUTH); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_SECURITY); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_NOT_FOUND); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_REQUEST); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_USER_CANCELLED); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER); + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - // wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + - // category + " (" + evt.GetString() + ")'"); - - // Show the info bar with an error - // m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + - // "\n" + "'" + category + "'", wxICON_ERROR); - BOOST_LOG_TRIVIAL(trace) << "GuideFrame::OnError: An error occurred loading " << evt.GetURL() << category; - - UpdateState(); + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":GuideFrame error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); } void GuideFrame::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebPreprintDialog.cpp b/src/slic3r/GUI/WebPreprintDialog.cpp index 6267a457af..aac8f37ad3 100644 --- a/src/slic3r/GUI/WebPreprintDialog.cpp +++ b/src/slic3r/GUI/WebPreprintDialog.cpp @@ -151,9 +151,21 @@ void WebPreprintDialog::OnDocumentLoaded(wxWebViewEvent &evt) evt.Skip(); } -void WebPreprintDialog::OnError(wxWebViewEvent &evt) +void WebPreprintDialog::OnError(wxWebViewEvent &event) { - wxLogError("Web View Error: %s", evt.GetString()); + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; + } + + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebPreprintDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); } void WebPreprintDialog::OnScriptMessage(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/WebPresetDialog.cpp b/src/slic3r/GUI/WebPresetDialog.cpp index 3143ac2f76..1e59b48d5c 100644 --- a/src/slic3r/GUI/WebPresetDialog.cpp +++ b/src/slic3r/GUI/WebPresetDialog.cpp @@ -692,32 +692,21 @@ void WebPresetDialog::OnRunScriptArrayWithEmulationLevel(wxCommandEvent& WXUNUSE /** * Callback invoked when a loading error occurs */ -void WebPresetDialog::OnError(wxWebViewEvent& evt) +void WebPresetDialog::OnError(wxWebViewEvent& event) { -#define WX_ERROR_CASE(type) \ - case type: category = #type; break; - - wxString category; - switch (evt.GetInt()) { - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CONNECTION); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CERTIFICATE); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_AUTH); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_SECURITY); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_NOT_FOUND); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_REQUEST); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_USER_CANCELLED); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER); + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - // wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + - // category + " (" + evt.GetString() + ")'"); - - // Show the info bar with an error - // m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + - // "\n" + "'" + category + "'", wxICON_ERROR); - BOOST_LOG_TRIVIAL(trace) << "WebPresetDialog::OnError: An error occurred loading " << evt.GetURL() << category; - - UpdateState(); + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebPresetDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); } void WebPresetDialog::OnScriptResponseMessage(wxCommandEvent& WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebSMUserLoginDialog.cpp b/src/slic3r/GUI/WebSMUserLoginDialog.cpp index 5292c4cd67..85367b5479 100644 --- a/src/slic3r/GUI/WebSMUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebSMUserLoginDialog.cpp @@ -387,42 +387,20 @@ void SMUserLogin::OnRunScriptArrayWithEmulationLevel(wxCommandEvent &WXUNUSED(ev /** * Callback invoked when a loading error occurs */ -void SMUserLogin::OnError(wxWebViewEvent &evt) +void SMUserLogin::OnError(wxWebViewEvent &event) { -#define WX_ERROR_CASE(type) \ - case type: category = #type; break; - - wxString category; - switch (evt.GetInt()) { - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CONNECTION); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CERTIFICATE); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_AUTH); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_SECURITY); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_NOT_FOUND); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_REQUEST); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_USER_CANCELLED); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER); + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - - if( evt.GetInt()==wxWEBVIEW_NAV_ERR_CONNECTION ) - { - if(m_timer!=NULL) - m_timer->Stop(); - - m_networkOk = false; - - if (m_networkOk==false) - ShowErrorPage(); - } - - // wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + - // category + " (" + evt.GetString() + ")'"); - - // Show the info bar with an error - // m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + - // "\n" + "'" + category + "'", wxICON_ERROR); - - UpdateState(); + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":SMUserLogin error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); } void SMUserLogin::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebUrlDialog.cpp b/src/slic3r/GUI/WebUrlDialog.cpp index b410cdcf54..f81852a077 100644 --- a/src/slic3r/GUI/WebUrlDialog.cpp +++ b/src/slic3r/GUI/WebUrlDialog.cpp @@ -114,9 +114,21 @@ void WebUrlDialog::OnDocumentLoaded(wxWebViewEvent &evt) evt.Skip(); } -void WebUrlDialog::OnError(wxWebViewEvent &evt) +void WebUrlDialog::OnError(wxWebViewEvent &event) { - wxLogError("Web View Error: %s", evt.GetString()); + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; + } + + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebUrlDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); } void WebUrlDialog::OnScriptMessage(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 5afc43568a..2cca78168a 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -361,40 +361,20 @@ void ZUserLogin::OnRunScriptArrayWithEmulationLevel(wxCommandEvent &WXUNUSED(evt /** * Callback invoked when a loading error occurs */ -void ZUserLogin::OnError(wxWebViewEvent &evt) +void ZUserLogin::OnError(wxWebViewEvent &event) { -#define WX_ERROR_CASE(type) \ - case type: category = #type; break; - - wxString category; - switch (evt.GetInt()) { - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CONNECTION); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CERTIFICATE); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_AUTH); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_SECURITY); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_NOT_FOUND); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_REQUEST); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_USER_CANCELLED); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER); + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - - if( evt.GetInt()==wxWEBVIEW_NAV_ERR_CONNECTION ) - { - if(m_timer!=NULL) - m_timer->Stop(); - - if (m_networkOk==false) - ShowErrorPage(); - } - - // wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + - // category + " (" + evt.GetString() + ")'"); - - // Show the info bar with an error - // m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + - // "\n" + "'" + category + "'", wxICON_ERROR); - - UpdateState(); + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":ZUserLogin error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); } void ZUserLogin::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) From 2519603b3dccf922ec141ed4ed9bb4eaba837752 Mon Sep 17 00:00:00 2001 From: alves Date: Wed, 14 Jan 2026 11:07:26 +0800 Subject: [PATCH 5/5] feature add bury point for webview init. --- src/slic3r/GUI/MarkdownTip.cpp | 14 ++++++++ src/slic3r/GUI/PrinterWebView.cpp | 2 ++ src/slic3r/GUI/ReleaseNote.cpp | 2 ++ src/slic3r/GUI/WebDeviceDialog.cpp | 3 +- src/slic3r/GUI/WebGuideDialog.cpp | 3 +- src/slic3r/GUI/WebPreprintDialog.cpp | 2 ++ src/slic3r/GUI/WebPresetDialog.cpp | 3 +- src/slic3r/GUI/WebSMUserLoginDialog.cpp | 1 + src/slic3r/GUI/WebUrlDialog.cpp | 2 ++ src/slic3r/GUI/WebUserLoginDialog.cpp | 3 +- src/slic3r/GUI/WebViewDialog.cpp | 44 ++++++++----------------- 11 files changed, 45 insertions(+), 34 deletions(-) diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp index 7ffeae9e36..bfd9608a0e 100644 --- a/src/slic3r/GUI/MarkdownTip.cpp +++ b/src/slic3r/GUI/MarkdownTip.cpp @@ -8,6 +8,7 @@ #include "I18N.hpp" #include +#include "sentry_wrapper/SentryWrapper.hpp" namespace fs = boost::filesystem; @@ -268,6 +269,19 @@ void MarkdownTip::OnTitleChanged(wxWebViewEvent& event) } void MarkdownTip::OnError(wxWebViewEvent& event) { + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; + } + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":MarkdownTip error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init MarkdownTip webview fail", BP_WEB_VIEW); } void MarkdownTip::OnTimer(wxTimerEvent& event) diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 9af9872799..e2cb533bbd 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -15,6 +15,7 @@ #include #include #include "slic3r/GUI/SSWCP.hpp" +#include "sentry_wrapper/SentryWrapper.hpp" namespace pt = boost::property_tree; @@ -184,6 +185,7 @@ void PrinterWebView::OnError(wxWebViewEvent &evt) break; } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":PrinterWebView error loading page %1% %2% %3% %4%") %evt.GetURL() %evt.GetTarget() %e %evt.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init PrinterWebView webview fail", BP_WEB_VIEW); } void PrinterWebView::OnLoaded(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 42629f2ba7..b8f2b0a210 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -24,6 +24,7 @@ #include "Plater.hpp" #include "BitmapCache.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "sentry_wrapper/SentryWrapper.hpp" namespace Slic3r { namespace GUI { @@ -457,6 +458,7 @@ void UpdateVersionDialog::OnError(wxWebViewEvent& event) case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":UpdateVersionDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e %event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init UpdateVersionDialog webview fail", BP_WEB_VIEW); event.Skip(); } diff --git a/src/slic3r/GUI/WebDeviceDialog.cpp b/src/slic3r/GUI/WebDeviceDialog.cpp index ba9b5f66d8..c7addbad3a 100644 --- a/src/slic3r/GUI/WebDeviceDialog.cpp +++ b/src/slic3r/GUI/WebDeviceDialog.cpp @@ -5,6 +5,7 @@ #include "SSWCP.hpp" #include #include +#include "sentry_wrapper/SentryWrapper.hpp" namespace Slic3r { namespace GUI { @@ -117,7 +118,7 @@ void WebDeviceDialog::OnError(wxWebViewEvent &evt) case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebDeviceDialog error loading page %1% %2% %3% %4%") % evt.GetURL() % evt.GetTarget() % e %evt.GetString(); - + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init WebDeviceDialog webview fail", BP_WEB_VIEW); } void WebDeviceDialog::OnScriptMessage(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index dc0f7ca493..7b4eee552e 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -34,7 +34,7 @@ #include #include "CreatePresetsDialog.hpp" #include -#include "bury_cfg/bury_point.hpp" +#include "sentry_wrapper/SentryWrapper.hpp" using namespace nlohmann; @@ -611,6 +611,7 @@ void GuideFrame::OnError(wxWebViewEvent& event) } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":GuideFrame error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init GuideFrame webview fail", BP_WEB_VIEW); } void GuideFrame::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebPreprintDialog.cpp b/src/slic3r/GUI/WebPreprintDialog.cpp index aac8f37ad3..7068d93ab2 100644 --- a/src/slic3r/GUI/WebPreprintDialog.cpp +++ b/src/slic3r/GUI/WebPreprintDialog.cpp @@ -6,6 +6,7 @@ #include #include #include "NotificationManager.hpp" +#include "sentry_wrapper/SentryWrapper.hpp" namespace Slic3r { namespace GUI { @@ -166,6 +167,7 @@ void WebPreprintDialog::OnError(wxWebViewEvent &event) } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebPreprintDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init WebPreprintDialog webview fail", BP_WEB_VIEW); } void WebPreprintDialog::OnScriptMessage(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/WebPresetDialog.cpp b/src/slic3r/GUI/WebPresetDialog.cpp index 1e59b48d5c..b38bda9da4 100644 --- a/src/slic3r/GUI/WebPresetDialog.cpp +++ b/src/slic3r/GUI/WebPresetDialog.cpp @@ -6,7 +6,7 @@ #include "libslic3r/AppConfig.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" -#include "common_func/common_func.hpp" +#include "sentry_wrapper/SentryWrapper.hpp" #include #include @@ -707,6 +707,7 @@ void WebPresetDialog::OnError(wxWebViewEvent& event) } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebPresetDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init WebPresetDialog webview fail", BP_WEB_VIEW); } void WebPresetDialog::OnScriptResponseMessage(wxCommandEvent& WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebSMUserLoginDialog.cpp b/src/slic3r/GUI/WebSMUserLoginDialog.cpp index 85367b5479..94ab2680d7 100644 --- a/src/slic3r/GUI/WebSMUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebSMUserLoginDialog.cpp @@ -401,6 +401,7 @@ void SMUserLogin::OnError(wxWebViewEvent &event) case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":SMUserLogin error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init SMUserLogin webview fail", BP_WEB_VIEW); } void SMUserLogin::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebUrlDialog.cpp b/src/slic3r/GUI/WebUrlDialog.cpp index f81852a077..c6ea8de44b 100644 --- a/src/slic3r/GUI/WebUrlDialog.cpp +++ b/src/slic3r/GUI/WebUrlDialog.cpp @@ -6,6 +6,7 @@ #include "SSWCP.hpp" #include #include +#include "sentry_wrapper/SentryWrapper.hpp" namespace Slic3r { namespace GUI { @@ -129,6 +130,7 @@ void WebUrlDialog::OnError(wxWebViewEvent &event) } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":WebUrlDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init WebUrlDialog webview fail", BP_WEB_VIEW); } void WebUrlDialog::OnScriptMessage(wxWebViewEvent &evt) diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 2cca78168a..21aa1c68fc 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -5,7 +5,7 @@ #include "libslic3r/AppConfig.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" -#include "common_func/common_func.hpp" +#include "sentry_wrapper/SentryWrapper.hpp" #include #include @@ -375,6 +375,7 @@ void ZUserLogin::OnError(wxWebViewEvent &event) case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":ZUserLogin error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init ZUserLogin webview fail", BP_WEB_VIEW); } void ZUserLogin::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 98aa42af2a..ac4c26943b 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -4,7 +4,7 @@ #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/MainFrame.hpp" -#include "common_func/common_func.hpp" +#include "sentry_wrapper/SentryWrapper.hpp" #include "../Utils/Http.hpp" #include "SSWCP.hpp" @@ -894,37 +894,21 @@ void WebViewPanel::OnSelectAll(wxCommandEvent& WXUNUSED(evt)) /** * Callback invoked when a loading error occurs */ -void WebViewPanel::OnError(wxWebViewEvent& evt) +void WebViewPanel::OnError(wxWebViewEvent& event) { -#define WX_ERROR_CASE(type) \ - case type: \ - category = #type; \ - break; - - wxString category; - switch (evt.GetInt()) - { - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CONNECTION); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_CERTIFICATE); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_AUTH); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_SECURITY); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_NOT_FOUND); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_REQUEST); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_USER_CANCELLED); - WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER); + auto e = "unknown error"; + switch (event.GetInt()) { + case wxWEBVIEW_NAV_ERR_CONNECTION: e = "wxWEBVIEW_NAV_ERR_CONNECTION"; break; + case wxWEBVIEW_NAV_ERR_CERTIFICATE: e = "wxWEBVIEW_NAV_ERR_CERTIFICATE"; break; + case wxWEBVIEW_NAV_ERR_AUTH: e = "wxWEBVIEW_NAV_ERR_AUTH"; break; + case wxWEBVIEW_NAV_ERR_SECURITY: e = "wxWEBVIEW_NAV_ERR_SECURITY"; break; + case wxWEBVIEW_NAV_ERR_NOT_FOUND: e = "wxWEBVIEW_NAV_ERR_NOT_FOUND"; break; + case wxWEBVIEW_NAV_ERR_REQUEST: e = "wxWEBVIEW_NAV_ERR_REQUEST"; break; + case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; + case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - - BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": [" << category << "] " << evt.GetString().ToUTF8().data(); - - if (wxGetApp().get_mode() == comDevelop) - { - wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'"); - - // Show the info bar with an error - m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + "\n" + "'" + category + "'", wxICON_ERROR); - } - - UpdateState(); + BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":PrinterWebView error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); + Slic3r::sentryReportLog(Slic3r::SENTRY_LOG_FATAL, "bury_point_init WebViewPanel webview fail", BP_WEB_VIEW); }