Merge branch 'main' into CURA-9830_consolidate_polygon_classes

Ultimaker · May 17, 2024 · 55ab583 · 55ab583
2 parents 40ed0cd + 8a3debd
commit 55ab583
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 47 deletions.
diff --git a/src/utils/SVG.cpp b/src/utils/SVG.cpp
@@ -88,7 +88,7 @@ SVG::SVG(std::string filename, AABB aabb, double scale, Point2LL canvas_size, Co
     out_ = fopen(filename.c_str(), "w");
     if (! out_)
     {
-        spdlog::error("The file %s could not be opened for writing.", filename);
+        spdlog::error("The file {} could not be opened for writing.", filename);
     }
     if (output_is_html_)
     {

diff --git a/src/utils/polygonUtils.cpp b/src/utils/polygonUtils.cpp
@@ -22,7 +22,6 @@
 #include <spdlog/spdlog.h>
 
 #include "utils/AABB.h"
-#include "utils/SVG.h"
 #endif
 
 namespace cura
@@ -694,51 +693,7 @@ ClosestPointPolygon PolygonUtils::ensureInsideOrOutside(
                 bool overall_is_inside = polygons.inside(overall_inside.location_);
                 if (overall_is_inside != (preferred_dist_inside > 0))
                 {
-#ifdef DEBUG
-                    static bool has_run = false;
-                    if (! has_run)
-                    {
-                        try
-                        {
-                            int offset_performed = offset / 2;
-                            AABB aabb(polygons);
-                            aabb.expand(std::abs(preferred_dist_inside) * 2);
-                            SVG svg("debug.html", aabb);
-                            svg.writeComment("Original polygon in black");
-                            svg.writePolygons(polygons, SVG::Color::BLACK);
-                            for (auto poly : polygons)
-                            {
-                                for (auto point : poly)
-                                {
-                                    svg.writePoint(point, true, 2);
-                                }
-                            }
-                            std::stringstream ss;
-                            svg.writeComment("Reference polygon in yellow");
-                            svg.writePolygon(closest_poly, SVG::Color::YELLOW);
-                            ss << "Offsetted polygon in blue with offset " << offset_performed;
-                            svg.writeComment(ss.str());
-                            svg.writePolygons(insetted, SVG::Color::BLUE);
-                            for (auto poly : insetted)
-                            {
-                                for (auto point : poly)
-                                {
-                                    svg.writePoint(point, true, 2);
-                                }
-                            }
-                            svg.writeComment("From location");
-                            svg.writePoint(from, true, 5, SVG::Color::GREEN);
-                            svg.writeComment("Location computed to be inside the black polygon");
-                            svg.writePoint(inside.location_, true, 5, SVG::Color::RED);
-                        }
-                        catch (...)
-                        {
-                        }
-                        spdlog::error("Clipper::offset failed. See generated debug.html! Black is original Blue is offsetted polygon");
-                        has_run = true;
-                    }
-#endif
-                    return ClosestPointPolygon();
+                    return ClosestPolygonPoint();
                 }
                 inside = overall_inside;
             }