juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

NEW: Ignore Nozzel Select in UserGuide

Browse Source 
JIRA: none
Change-Id: I507a92abb9137167dbcbe1def8276f868529c4ab
(cherry picked from commit 99a8139c1b915709a854296f22a222bac07a47ce)
This commit is contained in:
zorro.zhang
2025-02-21 11:22:53 +08:00
committed by Noisyfox
parent 12226c472b
commit adf85c5080
8 changed files with 242 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/WebGuideDialog.cpp
View File

@@ -437,7 +437,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
wxString s1 = TmpModel["model"];
wxString s2 = OneSelect["model"];
if (s1.compare(s2) == 0) {
m_ProfileJson["model"][m]["nozzle_selected"] = OneSelect["nozzle_diameter"];
m_ProfileJson["model"][m]["nozzle_selected"] = m_ProfileJson["model"][m]["nozzle_diameter"];
break;
}
}
@@ -517,7 +517,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
BOOST_LOG_TRIVIAL(trace) << "GuideFrame::OnScriptMessage;Error:" << e.what();
}
//wxString strAll = m_ProfileJson.dump(-1,' ',false, json::error_handler_t::ignore);
wxString strAll = m_ProfileJson.dump(-1,' ',false, json::error_handler_t::ignore);
}
void GuideFrame::RunScript(const wxString &javascript)

4
src/slic3r/GUI/WebViewDialog.cpp
View File

@@ -544,7 +544,7 @@ void WebViewPanel::update_mode()
*/
void WebViewPanel::OnNavigationRequest(wxWebViewEvent& evt)
{
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetURL().ToUTF8().data();
const wxString &url = evt.GetURL();
if (url.StartsWith("File://") || url.StartsWith("file://")) {
if (!url.Contains("/web/homepage/index.html")) {
@@ -590,7 +590,7 @@ void WebViewPanel::OnNavigationComplete(wxWebViewEvent& evt)
{
m_browser->Show();
Layout();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetURL().ToUTF8().data();
if (wxGetApp().get_mode() == comDevelop)
wxLogMessage("%s", "Navigation complete; url='" + evt.GetURL() + "'");
UpdateState();