GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-30 06:52:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ms_fix_nearest_corner_seam'

Browse Source
This commit is contained in:
Lukas Matena 2024-06-20 14:53:49 +02:00
commit 7db176ac84
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/GCode/SeamPlacer.cpp
View File

@ -288,12 +288,8 @@ struct NearestCorner {
perimeter.point_classifications[i] == point_classification && perimeter.point_classifications[i] == point_classification &&
perimeter.angle_types[i] != Perimeters::AngleType::smooth) { perimeter.angle_types[i] != Perimeters::AngleType::smooth) {
const Vec2d &point{perimeter.positions[i]}; const Vec2d &point{perimeter.positions[i]};
if (!corner_candidate) {
corner_candidate = {i, i, point};
continue;
}
const double distance{(prefered_position - point).norm()}; const double distance{(prefered_position - point).norm()};
if (distance < min_distance) { if (!corner_candidate || distance < min_distance) {
corner_candidate = {i, i, point}; corner_candidate = {i, i, point};
min_distance = distance; min_distance = distance;
} }

3
src/slic3r/GUI/UserAccountCommunication.cpp
View File

@ -5,6 +5,7 @@
#include "../Utils/Http.hpp" #include "../Utils/Http.hpp"
#include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/I18N.hpp"
#include <boost/algorithm/string/split.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <boost/beast/core/detail/base64.hpp> #include <boost/beast/core/detail/base64.hpp>
#include <curl/curl.h> #include <curl/curl.h>
@ -567,4 +568,4 @@ std::string CodeChalengeGenerator::sha256(const std::string& input) {
return std::string(reinterpret_cast<char*>(digest), digestLen); return std::string(reinterpret_cast<char*>(digest), digestLen);
} }
#endif // __linux__ #endif // __linux__
}} // Slic3r::GUI }} // Slic3r::GUI

1
src/slic3r/GUI/UserAccountCommunication.hpp
View File

@ -11,6 +11,7 @@
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <memory> #include <memory>
#include <wx/timer.h>
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {