From 8594787d582aa9f56bd3fcdb66c21446d2e43980 Mon Sep 17 00:00:00 2001 From: sunsets <845944018@qq.com> Date: Fri, 3 Nov 2023 18:43:18 +0800 Subject: [PATCH 1/3] Update Plater.cpp --- src/slic3r/GUI/Plater.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 2cbf9d9..e1b3b6a 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5521,7 +5521,7 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep) add_num_text(num_str, Vec2d(plate_center.x() - 50, plate_center.y() - step_spacing / 2)); std::stringstream gcode; - gcode << "\n;WIDTH:" << pa_line_width; + // gcode << "\n;WIDTH:" << pa_line_width; gcode << set_pa_acceleration(external_perimeter_acceleration); gcode << move_to(Vec2d(start_x + 80, start_y), pa_travel_speed, retract_length, retract_speed); gcode << move_to(pa_layer_height); @@ -5637,7 +5637,7 @@ void Plater::calib_pa_pattern(const double StartPA, double EndPA, double PAStep) //B34 Generate Gcode std::stringstream gcode; - gcode << "\n;WIDTH:" << pa_line_width; + // gcode << "\n;WIDTH:" << pa_line_width; gcode << set_pa_acceleration(external_perimeter_acceleration); gcode << move_to(Vec2d(start_x + 2 * line_spacing, start_y - 2 * line_spacing), pa_travel_speed, retract_length, retract_speed); From aa434bbef0b80a3a1ebf396383c8e12e28ff23bc Mon Sep 17 00:00:00 2001 From: sunsets <845944018@qq.com> Date: Sat, 4 Nov 2023 14:10:55 +0800 Subject: [PATCH 2/3] Update GCode.cpp --- src/libslic3r/GCode.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index e1c5beb..0a75e0c 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -3501,7 +3501,7 @@ std::string GCode::set_extruder(unsigned int extruder_id, double print_z) return gcode; } - +//B41 std::string GCode::set_object_range(Print &print) { std::string gcode; @@ -3558,6 +3558,9 @@ std::string GCode::set_object_range(Print &print) Point center = contour.centroid(); char buffer[64]; std::replace(name.begin(), name.end(), ' ', '_'); + std::replace(name.begin(), name.end(), '#', '_'); + std::replace(name.begin(), name.end(), '*', '_'); + std::replace(name.begin(), name.end(), ':', '_'); gcode += (std::string("EXCLUDE_OBJECT_DEFINE NAME=") + name); std::snprintf(buffer, sizeof(buffer) - 1, " CENTER=%.3f,%.3f", unscale(center[0]), unscale(center[1])); gcode += buffer + std::string(" POLYGON=["); From 5d9f6cd3455ab5e302bfb9b1b23580f7dcc539fd Mon Sep 17 00:00:00 2001 From: Wang YB <94800665+Gradbb@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:35:16 +0800 Subject: [PATCH 3/3] reduce solid infill --- src/libslic3r/Fill/FillEnsuring.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/Fill/FillEnsuring.cpp b/src/libslic3r/Fill/FillEnsuring.cpp index 1891108..1f3b632 100644 --- a/src/libslic3r/Fill/FillEnsuring.cpp +++ b/src/libslic3r/Fill/FillEnsuring.cpp @@ -292,9 +292,18 @@ ThickPolylines make_fill_polylines( // svg.draw(to_lines(gaps_for_additional_filling), "green", scale_(0.2)); // svg.draw(vertical_lines, "black", scale_(0.1)); // svg.Close(); - + //w11 + const coord_t threshold = scaled_spacing * 4.5; for (ExPolygon &ex_poly : gaps_for_additional_filling) { + //w11 + if (ex_poly.contour.length() < threshold) { + continue; + } BoundingBox ex_bb = ex_poly.contour.bounding_box(); + //w11 + if (ex_bb.size().x() < threshold || ex_bb.size().y() < threshold) { + continue; + } coord_t loops_count = (std::max(ex_bb.size().x(), ex_bb.size().y()) + scaled_spacing - 1) / scaled_spacing; Polygons polygons = to_polygons(ex_poly); Arachne::WallToolPaths wall_tool_paths(polygons, scaled_spacing, scaled_spacing, loops_count, 0, params.layer_height,