From 49f8400403d510997c89e328ede0208709c7cec4 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 24 Nov 2023 21:27:52 +0100 Subject: [PATCH 1/2] Fix issue where part of raft was missing CURA-11355 --- src/FffGcodeWriter.cpp | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/FffGcodeWriter.cpp b/src/FffGcodeWriter.cpp index a42d12889d..bb803e6a73 100644 --- a/src/FffGcodeWriter.cpp +++ b/src/FffGcodeWriter.cpp @@ -929,9 +929,37 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage) skip_some_zags, zag_skip_count, pocket_size); + std::vector raft_paths; // Should remain empty, since we have no walls. infill_comp.generate(raft_paths, raft_polygons, raft_lines, surface_settings, layer_nr, SectionType::ADHESION); - gcode_layer.addLinesByOptimizer(raft_lines, gcode_layer.configs_storage.raft_surface_config, SpaceFillType::Lines, false, 0, 1.0, last_planned_position); + + const auto wipe_dist = 0; + const auto spiralize = false; + const auto flow_ratio = 1.0_r; + const auto enable_travel_optimization = false; + const auto always_retract = false; + const auto reverse_order = false; + + gcode_layer.addLinesByOptimizer( + raft_lines, + gcode_layer.configs_storage.raft_surface_config, + SpaceFillType::Lines, + enable_travel_optimization, + wipe_dist, + flow_ratio, + last_planned_position + ); + gcode_layer.addPolygonsByOptimizer( + raft_polygons, + gcode_layer.configs_storage.raft_surface_config, + ZSeamConfig(), + wipe_dist, + spiralize, + flow_ratio, + always_retract, + reverse_order, + gcode_layer.getLastPlannedPositionOrStartingPosition() + ); raft_polygons.clear(); raft_lines.clear(); From 1d7038b8a67d7eb76bd16ae3782935da4b731636 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 24 Nov 2023 20:28:24 +0000 Subject: [PATCH 2/2] Applied clang-format. --- src/FffGcodeWriter.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/FffGcodeWriter.cpp b/src/FffGcodeWriter.cpp index bb803e6a73..e9694634f8 100644 --- a/src/FffGcodeWriter.cpp +++ b/src/FffGcodeWriter.cpp @@ -947,8 +947,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage) enable_travel_optimization, wipe_dist, flow_ratio, - last_planned_position - ); + last_planned_position); gcode_layer.addPolygonsByOptimizer( raft_polygons, gcode_layer.configs_storage.raft_surface_config, @@ -958,8 +957,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage) flow_ratio, always_retract, reverse_order, - gcode_layer.getLastPlannedPositionOrStartingPosition() - ); + gcode_layer.getLastPlannedPositionOrStartingPosition()); raft_polygons.clear(); raft_lines.clear();