QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 23:48:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with update

Browse Source
This commit is contained in:
QIDI TECH
2023-06-27 19:43:01 +08:00
parent dd0d4c8c4a
commit 2de3fb95b5
6 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/wxWidgets/wxWidgets.cmake vendored
View File

@@ -32,7 +32,7 @@ endif()
qidislicer_add_cmake_project(wxWidgets qidislicer_add_cmake_project(wxWidgets
URL https://github.com/prusa3d/wxWidgets/archive/78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26.zip URL https://github.com/prusa3d/wxWidgets/archive/78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26.zip
URL_HASH SHA256=94b7d972373503e380e5a8b0ca63b1ccb956da4006402298dd89a0c5c7041b1e 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 DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG dep_NanoSVG
CMAKE_ARGS CMAKE_ARGS
-DwxBUILD_PRECOMP=ON -DwxBUILD_PRECOMP=ON

2
src/libslic3r/PrintConfig.hpp
View File

@@ -44,7 +44,7 @@ enum class MachineLimitsUsage {
}; };
enum PrintHostType { enum PrintHostType {
htPrusaLink, htPrusaConnect, htOctoPrint, htMoonraker, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS htQIDILink, htQIDIConnect, htOctoPrint, htMoonraker, htDuet, htFlashAir, htAstroBox, htRepetier, htMKS
}; };
enum AuthorizationType { enum AuthorizationType {

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

@@ -1162,7 +1162,7 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
// then the rest // then the rest
// in alphabetical order // 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 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; bool add_TEMPLATES_item = false;
for (int i = 0 ; i < list->size(); ++i) { for (int i = 0 ; i < list->size(); ++i) {

10
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -2660,7 +2660,6 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
// contained_min_one && !m_model->objects.empty() && !partlyOut)); // contained_min_one && !m_model->objects.empty() && !partlyOut));
if (isToolpathOutside) { if (isToolpathOutside) {
post_event(Event<bool>(EVT_GLCANVAS_ENABLE_EXPORT_BUTTONS, false)); post_event(Event<bool>(EVT_GLCANVAS_ENABLE_EXPORT_BUTTONS, false));
isToolpathOutside = false;
} }
else { else {
post_event(Event<bool>(EVT_GLCANVAS_ENABLE_ACTION_BUTTONS, 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()); m_gcode_viewer.load(gcode_result, *this->fff_print());
if (wxGetApp().is_editor()) { if (wxGetApp().is_editor()) {
//Y5
isToolpathOutside = false;
m_gcode_viewer.update_shells_color_by_extruder(m_config); m_gcode_viewer.update_shells_color_by_extruder(m_config);
_set_warning_notification_if_needed(EWarning::ToolpathOutside); _set_warning_notification_if_needed(EWarning::ToolpathOutside);
_set_warning_notification_if_needed(EWarning::GCodeConflict); _set_warning_notification_if_needed(EWarning::GCodeConflict);
@@ -7503,11 +7504,8 @@ void GLCanvas3D::_set_warning_notification_if_needed(EWarning warning)
} }
//Y5 //Y5
if (warning == EWarning::ToolpathOutside) { if (show) {
isToolpathOutside = show; isToolpathOutside = true;
}
else {
isToolpathOutside = false;
} }
_set_warning_notification(warning, show); _set_warning_notification(warning, show);
} }

2
src/slic3r/GUI/Widgets/WebView.cpp
View File

@@ -254,7 +254,7 @@ bool WebView::RunScript(wxWebView *webView, wxString const &javascript)
if (webView2 == nullptr) if (webView2 == nullptr)
return false; return false;
int count = 0; int count = 0;
wxJSScriptWrapper wrapJS(javascript, &count); wxJSScriptWrapper wrapJS(javascript, wxJSScriptWrapper::OutputType::JS_OUTPUT_RAW);
return webView2->ExecuteScript(wrapJS.GetWrappedCode(), NULL) == 0; return webView2->ExecuteScript(wrapJS.GetWrappedCode(), NULL) == 0;
#elif defined __WXMAC__ #elif defined __WXMAC__
WKWebView * wkWebView = (WKWebView *) webView->GetNativeBackend(); WKWebView * wkWebView = (WKWebView *) webView->GetNativeBackend();

5
src/slic3r/Utils/Moonraker.cpp
View File

@@ -239,13 +239,8 @@ void Moonraker::set_auth(Http &http) const
if (!m_cafile.empty()) if (!m_cafile.empty())
http.ca_file(m_cafile); http.ca_file(m_cafile);
} }
<<<<<<< Updated upstream:src/slic3r/Utils/Mainsail.cpp
//B4 //B4
std::string Mainsail::make_url(const std::string &path) const
=======
std::string Moonraker::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"; std::string m_host_add = m_host + ":10088";
if (m_host_add.find("http://") == 0 || m_host_add.find("https://") == 0) { if (m_host_add.find("http://") == 0 || m_host_add.find("https://") == 0) {