From 2de3fb95b5b977c0849da81a71cc49a46267afbc Mon Sep 17 00:00:00 2001
From: QIDI TECH <893239786@qq.com>
Date: Tue, 27 Jun 2023 19:43:01 +0800
Subject: [PATCH] Fix bug with update

---
 deps/wxWidgets/wxWidgets.cmake     |  2 +-
 src/libslic3r/PrintConfig.hpp      |  2 +-
 src/slic3r/GUI/ConfigWizard.cpp    |  2 +-
 src/slic3r/GUI/GLCanvas3D.cpp      | 10 ++++------
 src/slic3r/GUI/Widgets/WebView.cpp |  2 +-
 src/slic3r/Utils/Moonraker.cpp     |  5 -----
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake
index 7e934a0..2ab56e3 100644
--- a/deps/wxWidgets/wxWidgets.cmake
+++ b/deps/wxWidgets/wxWidgets.cmake
@@ -32,7 +32,7 @@ endif()
 qidislicer_add_cmake_project(wxWidgets
     URL https://github.com/prusa3d/wxWidgets/archive/78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26.zip
     URL_HASH SHA256=94b7d972373503e380e5a8b0ca63b1ccb956da4006402298dd89a0c5c7041b1e
-    PATCH_COMMAND ${_patch_cmd}
+    #PATCH_COMMAND ${_patch_cmd}
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG dep_NanoSVG
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index 8081e38..1cc7472 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -44,7 +44,7 @@ enum class MachineLimitsUsage {
 };
 
 enum PrintHostType {
-    htPrusaLink, htPrusaConnect, htOctoPrint, htMoonraker, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS
+    htQIDILink, htQIDIConnect, htOctoPrint, htMoonraker, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS
 };
 
 enum AuthorizationType {
diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp
index af4dd98..1e8ab6e 100644
--- a/src/slic3r/GUI/ConfigWizard.cpp
+++ b/src/slic3r/GUI/ConfigWizard.cpp
@@ -1162,7 +1162,7 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
 // then the rest
 // in alphabetical order
     
-    std::vector<std::reference_wrapper<const std::string>> prusa_profiles;
+    std::vector<std::reference_wrapper<const std::string>> qidi_profiles;
     std::vector<std::pair<std::wstring ,std::reference_wrapper<const std::string>>> other_profiles; // first is lower case id for sorting
     bool add_TEMPLATES_item = false;
     for (int i = 0 ; i < list->size(); ++i) {
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index ee00fde..246fc8c 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -2660,7 +2660,6 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
         //                       contained_min_one && !m_model->objects.empty() && !partlyOut));
         if (isToolpathOutside) {
             post_event(Event<bool>(EVT_GLCANVAS_ENABLE_EXPORT_BUTTONS, false));
-            isToolpathOutside = false;
         }
         else {
             post_event(Event<bool>(EVT_GLCANVAS_ENABLE_ACTION_BUTTONS, 
@@ -2720,6 +2719,8 @@ void GLCanvas3D::load_gcode_preview(const GCodeProcessorResult& gcode_result, co
     m_gcode_viewer.load(gcode_result, *this->fff_print());
 
     if (wxGetApp().is_editor()) {
+        //Y5
+        isToolpathOutside = false;
         m_gcode_viewer.update_shells_color_by_extruder(m_config);
         _set_warning_notification_if_needed(EWarning::ToolpathOutside);
         _set_warning_notification_if_needed(EWarning::GCodeConflict);
@@ -7503,11 +7504,8 @@ void GLCanvas3D::_set_warning_notification_if_needed(EWarning warning)
     }
     
     //Y5
-    if (warning == EWarning::ToolpathOutside) {
-        isToolpathOutside = show;
-    }
-    else {
-        isToolpathOutside = false;
+    if (show) {
+        isToolpathOutside = true;
     }
     _set_warning_notification(warning, show);
 }
diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp
index 0158376..3f19ab4 100644
--- a/src/slic3r/GUI/Widgets/WebView.cpp
+++ b/src/slic3r/GUI/Widgets/WebView.cpp
@@ -254,7 +254,7 @@ bool WebView::RunScript(wxWebView *webView, wxString const &javascript)
         if (webView2 == nullptr)
             return false;
         int count = 0;
-        wxJSScriptWrapper wrapJS(javascript, &count);
+        wxJSScriptWrapper wrapJS(javascript, wxJSScriptWrapper::OutputType::JS_OUTPUT_RAW);
         return webView2->ExecuteScript(wrapJS.GetWrappedCode(), NULL) == 0;
 #elif defined __WXMAC__
         WKWebView *       wkWebView = (WKWebView *) webView->GetNativeBackend();
diff --git a/src/slic3r/Utils/Moonraker.cpp b/src/slic3r/Utils/Moonraker.cpp
index e0293c8..d2d6ba4 100644
--- a/src/slic3r/Utils/Moonraker.cpp
+++ b/src/slic3r/Utils/Moonraker.cpp
@@ -239,13 +239,8 @@ void Moonraker::set_auth(Http &http) const
     if (!m_cafile.empty())
         http.ca_file(m_cafile);
 }
-<<<<<<< Updated upstream:src/slic3r/Utils/Mainsail.cpp
 //B4
-std::string Mainsail::make_url(const std::string &path) const
-=======
-
 std::string Moonraker::make_url(const std::string &path) const
->>>>>>> Stashed changes:src/slic3r/Utils/Moonraker.cpp
 {
     std::string m_host_add = m_host + ":10088";
     if (m_host_add.find("http://") == 0 || m_host_add.find("https://") == 0) {