From 23b7c4185702019840769f1c86e7be431b1385ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas@gmail.com>
Date: Wed, 31 Jan 2024 17:41:22 +0100
Subject: [PATCH] Move ColoredLine struct and related boost traits into the
 header file of MultiMaterialSegmentation.

---
 src/libslic3r/MultiMaterialSegmentation.cpp | 23 ----------------
 src/libslic3r/MultiMaterialSegmentation.hpp | 30 ++++++++++++++++++++-
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp
index 23f593c0eb..e40c081066 100644
--- a/src/libslic3r/MultiMaterialSegmentation.cpp
+++ b/src/libslic3r/MultiMaterialSegmentation.cpp
@@ -20,30 +20,7 @@
 #include <mutex>
 #include <boost/thread/lock_guard.hpp>
 
-namespace Slic3r {
-struct ColoredLine {
-    Line line;
-    int color;
-    int poly_idx = -1;
-    int local_line_idx = -1;
-};
-}
-
 #include <boost/polygon/polygon.hpp>
-namespace boost::polygon {
-template <>
-struct geometry_concept<Slic3r::ColoredLine> { typedef segment_concept type; };
-
-template <>
-struct segment_traits<Slic3r::ColoredLine> {
-    typedef coord_t coordinate_type;
-    typedef Slic3r::Point point_type;
-
-    static inline point_type get(const Slic3r::ColoredLine& line, const direction_1d& dir) {
-        return dir.to_int() ? line.line.b : line.line.a;
-    }
-};
-}
 
 //#define MMU_SEGMENTATION_DEBUG_GRAPH
 //#define MMU_SEGMENTATION_DEBUG_REGIONS
diff --git a/src/libslic3r/MultiMaterialSegmentation.hpp b/src/libslic3r/MultiMaterialSegmentation.hpp
index 6eb8815b16..2de93f9f05 100644
--- a/src/libslic3r/MultiMaterialSegmentation.hpp
+++ b/src/libslic3r/MultiMaterialSegmentation.hpp
@@ -10,13 +10,41 @@
 
 namespace Slic3r {
 
-
 class PrintObject;
 class ExPolygon;
+using ExPolygons = std::vector<ExPolygon>;
+
+struct ColoredLine
+{
+    Line line;
+    int  color;
+    int  poly_idx       = -1;
+    int  local_line_idx = -1;
+};
+
+using ColoredLines = std::vector<ColoredLine>;
 
 // Returns MMU segmentation based on painting in MMU segmentation gizmo
 std::vector<std::vector<ExPolygons>> multi_material_segmentation_by_painting(const PrintObject &print_object, const std::function<void()> &throw_on_cancel_callback);
 
 } // namespace Slic3r
 
+namespace boost::polygon {
+template<> struct geometry_concept<Slic3r::ColoredLine>
+{
+    typedef segment_concept type;
+};
+
+template<> struct segment_traits<Slic3r::ColoredLine>
+{
+    typedef coord_t       coordinate_type;
+    typedef Slic3r::Point point_type;
+
+    static inline point_type get(const Slic3r::ColoredLine &line, const direction_1d &dir)
+    {
+        return dir.to_int() ? line.line.b : line.line.a;
+    }
+};
+} // namespace boost::polygon
+
 #endif // slic3r_MultiMaterialSegmentation_hpp_