From 33e57827bcef648ec422cb0b9d962bb98365041f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0ach?= Date: Mon, 17 Jun 2024 17:38:56 +0200 Subject: [PATCH 1/2] Fix neares corner seam picking --- src/libslic3r/GCode/SeamPlacer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libslic3r/GCode/SeamPlacer.cpp b/src/libslic3r/GCode/SeamPlacer.cpp index 2a764b2663..14f7183ea5 100644 --- a/src/libslic3r/GCode/SeamPlacer.cpp +++ b/src/libslic3r/GCode/SeamPlacer.cpp @@ -288,12 +288,8 @@ struct NearestCorner { perimeter.point_classifications[i] == point_classification && perimeter.angle_types[i] != Perimeters::AngleType::smooth) { const Vec2d &point{perimeter.positions[i]}; - if (!corner_candidate) { - corner_candidate = {i, i, point}; - continue; - } const double distance{(prefered_position - point).norm()}; - if (distance < min_distance) { + if (!corner_candidate || distance < min_distance) { corner_candidate = {i, i, point}; min_distance = distance; } From 01148fc134ab6860b28b45a4a76efcef1a5191ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0ach?= Date: Mon, 17 Jun 2024 17:41:01 +0200 Subject: [PATCH 2/2] Fix includes --- src/slic3r/GUI/UserAccountCommunication.cpp | 3 ++- src/slic3r/GUI/UserAccountCommunication.hpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/UserAccountCommunication.cpp b/src/slic3r/GUI/UserAccountCommunication.cpp index 3c7cc539e8..934c61d9bc 100644 --- a/src/slic3r/GUI/UserAccountCommunication.cpp +++ b/src/slic3r/GUI/UserAccountCommunication.cpp @@ -5,6 +5,7 @@ #include "../Utils/Http.hpp" #include "slic3r/GUI/I18N.hpp" +#include #include #include #include @@ -567,4 +568,4 @@ std::string CodeChalengeGenerator::sha256(const std::string& input) { return std::string(reinterpret_cast(digest), digestLen); } #endif // __linux__ -}} // Slic3r::GUI \ No newline at end of file +}} // Slic3r::GUI diff --git a/src/slic3r/GUI/UserAccountCommunication.hpp b/src/slic3r/GUI/UserAccountCommunication.hpp index 133d2c8ca0..bbbe914308 100644 --- a/src/slic3r/GUI/UserAccountCommunication.hpp +++ b/src/slic3r/GUI/UserAccountCommunication.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace Slic3r { namespace GUI {