From 5adbe71d0cf4d3492a66d67b32d9cbe05bb96783 Mon Sep 17 00:00:00 2001 From: QIDI TECH <893239786@qq.com> Date: Tue, 27 Jun 2023 20:10:44 +0800 Subject: [PATCH] FIX BUG --- src/libslic3r/AABBMesh.hpp | 4 ++-- src/slic3r/GUI/Mouse3DHandlerMac.mm | 2 +- src/slic3r/GUI/Plater.cpp | 6 +++--- src/slic3r/GUI/Tab.cpp | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/libslic3r/AABBMesh.hpp b/src/libslic3r/AABBMesh.hpp index 3ef2597..86ccf10 100644 --- a/src/libslic3r/AABBMesh.hpp +++ b/src/libslic3r/AABBMesh.hpp @@ -1,5 +1,5 @@ -#ifndef PRUSASLICER_AABBMESH_H -#define PRUSASLICER_AABBMESH_H +#ifndef QIDISLICER_AABBMESH_H +#define QIDISLICER_AABBMESH_H #include #include diff --git a/src/slic3r/GUI/Mouse3DHandlerMac.mm b/src/slic3r/GUI/Mouse3DHandlerMac.mm index 29a2b80..54e2bc1 100644 --- a/src/slic3r/GUI/Mouse3DHandlerMac.mm +++ b/src/slic3r/GUI/Mouse3DHandlerMac.mm @@ -202,7 +202,7 @@ void Mouse3DController::init() // Registration is done either by 4letter constant (CFBundleSignature - obsolete //and we dont have that) or Executable name in pascal string(first byte is string lenght). //If no packets are recieved the name might be different - check cmake. If debugging try commenting - // set_target_properties(QIDISlicer PROPERTIES OUTPUT_NAME "prusa-slicer") + // set_target_properties(QIDISlicer PROPERTIES OUTPUT_NAME "qidi-slicer") clientID = RegisterConnexionClient( 0, "\013QIDISlicer", kConnexionClientModeTakeOver, kConnexionMaskAxis); BOOST_LOG_TRIVIAL(info) << "3dx mac handler registered"; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 0279310..e97a95e 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -4143,11 +4143,11 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt) const std::string message_dial = GUI::format("%1% %2% %3%" , _L_PLURAL("You are using template filament preset.", "You are using template filament presets.", templ_cnt) , _u8L("Please note that template presets are not customized for specific printer and should only be used as a starting point for creating your own user presets.") - , "https://help.prusa3d.com/" + , "https://qidi3d.com/" ); BOOST_LOG_TRIVIAL(warning) << message_notif; - notification_manager->push_slicing_warning_notification(message_notif, false, 0, 0, "https://help.prusa3d.com/", - [](wxEvtHandler* evnthndlr) { wxGetApp().open_browser_with_warning_dialog("https://help.prusa3d.com/article/template-filaments_467599"); return false; } + notification_manager->push_slicing_warning_notification(message_notif, false, 0, 0, "https://qidi3d.com/", + [](wxEvtHandler* evnthndlr) { wxGetApp().open_browser_with_warning_dialog("https://qidi3d.com/"); return false; } ); add_warning({ PrintStateBase::WarningLevel::CRITICAL, true, message_dial, 0}, 0); } diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index e7f45bb..8830e4c 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -466,7 +466,6 @@ void Tab::OnActivate() Refresh(); // Just refresh page, if m_presets_choice is already shown else { // From the tab creation whole top sizer is hidden to correct update of preset combobox's size - // (see https://github.com/prusa3d/PrusaSlicer/issues/10746) // On first OnActivate call show top sizer m_top_hsizer->ShowItems(true);