Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_wipe_moves

src/libslic3r/EdgeGrid.hpp

@@ -84,10 +84,14 @@ public:
 	template<typename VISITOR> void visit_cells_intersecting_line(Slic3r::Point p1, Slic3r::Point p2, VISITOR &visitor) const
 	{
 		// End points of the line segment.
-		p1(0) -= m_bbox.min(0);
-		p1(1) -= m_bbox.min(1);
-		p2(0) -= m_bbox.min(0);
-		p2(1) -= m_bbox.min(1);
+		assert(m_bbox.contains(p1));
+		assert(m_bbox.contains(p2));
+		p1 -= m_bbox.min;
+		p2 -= m_bbox.min;
+		assert(p1.x() >= 0 && p1.x() < m_cols * m_resolution);
+		assert(p1.y() >= 0 && p1.y() < m_rows * m_resolution);
+		assert(p2.x() >= 0 && p2.x() < m_cols * m_resolution);
+		assert(p2.y() >= 0 && p2.y() < m_rows * m_resolution);
 		// Get the cells of the end points.
 		coord_t ix = p1(0) / m_resolution;
 		coord_t iy = p1(1) / m_resolution;
@@ -115,18 +119,22 @@ public:
 						ey -= ex;
 						ex = int64_t(dy) * m_resolution;
 						ix += 1;
+						assert(ix <= ixb);
 					}
 					else if (ex == ey) {
 						ex = int64_t(dy) * m_resolution;
 						ey = int64_t(dx) * m_resolution;
 						ix += 1;
 						iy += 1;
+						assert(ix <= ixb);
+						assert(iy <= iyb);
 					}
 					else {
 						assert(ex > ey);
 						ex -= ey;
 						ey = int64_t(dx) * m_resolution;
 						iy += 1;
+						assert(iy <= iyb);
 					}
 					if (! visitor(iy, ix))
 						return;
@@ -141,11 +149,13 @@ public:
 						ey -= ex;
 						ex = int64_t(dy) * m_resolution;
 						ix += 1;
+						assert(ix <= ixb);
 					}
 					else {
 						ex -= ey;
 						ey = int64_t(dx) * m_resolution;
 						iy -= 1;
+						assert(iy >= iyb);
 					}
 					if (! visitor(iy, ix))
 						return;
@@ -163,12 +173,14 @@ public:
 						ey -= ex;
 						ex = int64_t(dy) * m_resolution;
 						ix -= 1;
+						assert(ix >= ixb);
 					}
 					else {
 						assert(ex >= ey);
 						ex -= ey;
 						ey = int64_t(dx) * m_resolution;
 						iy += 1;
+						assert(iy <= iyb);
 					}
 					if (! visitor(iy, ix))
 						return;
@@ -183,6 +195,7 @@ public:
 						ey -= ex;
 						ex = int64_t(dy) * m_resolution;
 						ix -= 1;
+						assert(ix >= ixb);
 					}
 					else if (ex == ey) {
 						// The lower edge of a grid cell belongs to the cell.
@@ -191,10 +204,12 @@ public:
 						if (dx > 0) {
 							ex = int64_t(dy) * m_resolution;
 							ix -= 1;
+							assert(ix >= ixb);
 						}
 						if (dy > 0) {
 							ey = int64_t(dx) * m_resolution;
 							iy -= 1;
+							assert(iy >= iyb);
 						}
 					}
 					else {
@@ -202,6 +217,7 @@ public:
 						ex -= ey;
 						ey = int64_t(dx) * m_resolution;
 						iy -= 1;
+						assert(iy >= iyb);
 					}
 					if (! visitor(iy, ix))
 						return;

src/libslic3r/Fill/FillBase.cpp

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <numeric>
 
 #include "../ClipperUtils.hpp"
 #include "../EdgeGrid.hpp"
@@ -28,6 +29,7 @@ Fill* Fill::new_from_type(const InfillPattern type)
     case ip3DHoneycomb:         return new Fill3DHoneycomb();
     case ipGyroid:              return new FillGyroid();
     case ipRectilinear:         return new FillRectilinear();
+    case ipAlignedRectilinear:  return new FillAlignedRectilinear();
     case ipMonotonic:           return new FillMonotonic();
     case ipLine:                return new FillLine();
     case ipGrid:                return new FillGrid();
@@ -840,7 +842,7 @@ void mark_boundary_segments_touching_infill(
 
 	EdgeGrid::Grid grid;
     // Make sure that the the grid is big enough for queries against the thick segment.
-	grid.set_bbox(boundary_bbox.inflated(distance_colliding + SCALED_EPSILON));
+	grid.set_bbox(boundary_bbox.inflated(distance_colliding * 1.43));
 	// Inflate the bounding box by a thick line width.
 	grid.create(boundary, std::max(clip_distance, distance_colliding) + scale_(10.));
 
@@ -960,9 +962,6 @@ void mark_boundary_segments_touching_infill(
 #endif // INFILL_DEBUG_OUTPUT
 	} visitor(grid, boundary, boundary_parameters, boundary_intersections, distance_colliding);
 
-	BoundingBoxf bboxf(boundary_bbox.min.cast<double>(), boundary_bbox.max.cast<double>());
-	bboxf.offset(- SCALED_EPSILON);
-
 	for (const Polyline &polyline : infill) {
 #ifdef INFILL_DEBUG_OUTPUT
         ++ iStep;
@@ -1018,12 +1017,14 @@ void mark_boundary_segments_touching_infill(
 				Vec2d vperp = perp(v);
 				Vec2d a = pt1 - v - vperp;
 				Vec2d b = pt2 + v - vperp;
-				if (Geometry::liang_barsky_line_clipping(a, b, bboxf))
-					grid.visit_cells_intersecting_line(a.cast<coord_t>(), b.cast<coord_t>(), visitor);
+                assert(grid.bbox().contains(a.cast<coord_t>()));
+                assert(grid.bbox().contains(b.cast<coord_t>()));
+				grid.visit_cells_intersecting_line(a.cast<coord_t>(), b.cast<coord_t>(), visitor);
 				a = pt1 - v + vperp;
 				b = pt2 + v + vperp;
-				if (Geometry::liang_barsky_line_clipping(a, b, bboxf))
-					grid.visit_cells_intersecting_line(a.cast<coord_t>(), b.cast<coord_t>(), visitor);
+                assert(grid.bbox().contains(a.cast<coord_t>()));
+                assert(grid.bbox().contains(b.cast<coord_t>()));
+                grid.visit_cells_intersecting_line(a.cast<coord_t>(), b.cast<coord_t>(), visitor);
 #endif
 #ifdef INFILL_DEBUG_OUTPUT
 //                export_infill_to_svg(boundary, boundary_parameters, boundary_intersections, infill, distance_colliding * 2, debug_out_path("%s-%03d-%03d-%03d.svg", "FillBase-mark_boundary_segments_touching_infill-step", iRun, iStep, int(point_idx)), { polyline });

src/libslic3r/Fill/FillRectilinear.hpp

@@ -29,6 +29,17 @@ protected:
     bool fill_surface_by_multilines(const Surface *surface, FillParams params, const std::initializer_list<SweepParams> &sweep_params, Polylines &polylines_out);
 };
 
+class FillAlignedRectilinear : public FillRectilinear
+{
+public:
+    Fill* clone() const override { return new FillAlignedRectilinear(*this); };
+    ~FillAlignedRectilinear() override = default;
+
+protected:
+    // Always generate infill at the same angle.
+    virtual float _layer_angle(size_t idx) const { return 0.f; }
+};
+
 class FillMonotonic : public FillRectilinear
 {
 public:

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -399,13 +399,11 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
     };
 
     // check for temporary lines
-    auto is_temporary_decoration = [](const std::string& gcode_line) {
+    auto is_temporary_decoration = [](const std::string_view gcode_line) {
         // remove trailing '\n'
-        std::string line = gcode_line.substr(0, gcode_line.length() - 1);
-        if (line == ";" + Layer_Change_Tag)
-            return true;
-        else
-            return false;
+        assert(! gcode_line.empty());
+        assert(gcode_line.back() == '\n');
+        return gcode_line.substr(0, gcode_line.length() - 1) == ";" + Layer_Change_Tag;
     };
 
     // Iterators for the normal and silent cached time estimate entry recently processed, used by process_line_G1.

src/libslic3r/Point.cpp

@@ -2,6 +2,7 @@
 #include "Line.hpp"
 #include "MultiPoint.hpp"
 #include "Int128.hpp"
+#include "BoundingBox.hpp"
 #include <algorithm>
 
 namespace Slic3r {

src/libslic3r/Preset.cpp

@@ -439,7 +439,7 @@ const std::vector<std::string>& Preset::filament_options()
 {
     static std::vector<std::string> s_opts {
         "filament_colour", "filament_diameter", "filament_type", "filament_soluble", "filament_notes", "filament_max_volumetric_speed",
-        "extrusion_multiplier", "filament_density", "filament_cost", "filament_loading_speed", "filament_loading_speed_start", "filament_load_time",
+        "extrusion_multiplier", "filament_density", "filament_cost", "filament_spool_weight", "filament_loading_speed", "filament_loading_speed_start", "filament_load_time",
         "filament_unloading_speed", "filament_unloading_speed_start", "filament_unload_time", "filament_toolchange_delay", "filament_cooling_moves",
         "filament_cooling_initial_speed", "filament_cooling_final_speed", "filament_ramming_parameters", "filament_minimal_purge_on_wipe_tower",
         "temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", "fan_always_on", "cooling", "min_fan_speed",

src/libslic3r/Print.cpp

@@ -98,6 +98,7 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
         "filament_density",
         "filament_notes",
         "filament_cost",
+        "filament_spool_weight",
         "first_layer_acceleration",
         "first_layer_bed_temperature",
         "first_layer_speed",

src/libslic3r/PrintConfig.cpp

@@ -460,12 +460,14 @@ void PrintConfigDef::init_fff_params()
     def->enum_keys_map = &ConfigOptionEnum<InfillPattern>::get_enum_values();
     def->enum_values.push_back("rectilinear");
     def->enum_values.push_back("monotonic");
+    def->enum_values.push_back("alignedrectilinear");
     def->enum_values.push_back("concentric");
     def->enum_values.push_back("hilbertcurve");
     def->enum_values.push_back("archimedeanchords");
     def->enum_values.push_back("octagramspiral");
     def->enum_labels.push_back(L("Rectilinear"));
     def->enum_labels.push_back(L("Monotonic"));
+    def->enum_labels.push_back(L("Aligned Rectilinear"));
     def->enum_labels.push_back(L("Concentric"));
     def->enum_labels.push_back(L("Hilbert Curve"));
     def->enum_labels.push_back(L("Archimedean Chords"));
@@ -483,7 +485,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_values = def_top_fill_pattern->enum_values;
     def->enum_labels = def_top_fill_pattern->enum_labels;
     def->aliases = def_top_fill_pattern->aliases;
-    def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipRectilinear));
+    def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipMonotonic));
 
     def = this->add("external_perimeter_extrusion_width", coFloatOrPercent);
     def->label = L("External perimeters");
@@ -806,6 +808,16 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->set_default_value(new ConfigOptionFloats { 0. });
 
+    def = this->add("filament_spool_weight", coFloats);
+    def->label = L("Spool weight");
+    def->tooltip = L("Enter weight of the empty filament spool. "
+                     "One may weigh a partially consumed filament spool before printing and one may compare the measured weight "
+                     "with the calculated weight of the filament with the spool to find out whether the amount "
+                     "of filament on the spool is sufficient to finish the print.");
+    def->sidetext = L("g");
+    def->min = 0;
+    def->set_default_value(new ConfigOptionFloats { 0. });
+
     def = this->add("filament_settings_id", coStrings);
     def->set_default_value(new ConfigOptionStrings { "" });
     def->cli = ConfigOptionDef::nocli;
@@ -871,6 +883,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Fill pattern for general low-density infill.");
     def->enum_keys_map = &ConfigOptionEnum<InfillPattern>::get_enum_values();
     def->enum_values.push_back("rectilinear");
+    def->enum_values.push_back("alignedrectilinear");
     def->enum_values.push_back("grid");
     def->enum_values.push_back("triangles");
     def->enum_values.push_back("stars");
@@ -886,6 +899,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("adaptivecubic");
     def->enum_values.push_back("supportcubic");
     def->enum_labels.push_back(L("Rectilinear"));
+    def->enum_labels.push_back(L("Aligned Rectilinear"));
     def->enum_labels.push_back(L("Grid"));
     def->enum_labels.push_back(L("Triangles"));
     def->enum_labels.push_back(L("Stars"));
@@ -1541,8 +1555,7 @@ void PrintConfigDef::init_fff_params()
     def = this->add("perimeter_acceleration", coFloat);
     def->label = L("Perimeters");
     def->tooltip = L("This is the acceleration your printer will use for perimeters. "
-                   "A high value like 9000 usually gives good results if your hardware is up to the job. "
-                   "Set zero to disable acceleration control for perimeters.");
+                     "Set zero to disable acceleration control for perimeters.");
     def->sidetext = L("mm/s²");
     def->mode = comExpert;
     def->set_default_value(new ConfigOptionFloat(0));

src/libslic3r/PrintConfig.hpp

@@ -44,7 +44,7 @@ enum AuthorizationType {
 };
 
 enum InfillPattern : int {
-    ipRectilinear, ipMonotonic, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb,
+    ipRectilinear, ipMonotonic, ipAlignedRectilinear, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb,
     ipGyroid, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipAdaptiveCubic, ipSupportCubic, ipCount,
 };
 
@@ -145,6 +145,7 @@ template<> inline const t_config_enum_values& ConfigOptionEnum<InfillPattern>::g
     if (keys_map.empty()) {
         keys_map["rectilinear"]         = ipRectilinear;
         keys_map["monotonic"]           = ipMonotonic;
+        keys_map["alignedrectilinear"]  = ipAlignedRectilinear;
         keys_map["grid"]                = ipGrid;
         keys_map["triangles"]           = ipTriangles;
         keys_map["stars"]               = ipStars;
@@ -683,6 +684,7 @@ public:
     ConfigOptionStrings             filament_type;
     ConfigOptionBools               filament_soluble;
     ConfigOptionFloats              filament_cost;
+    ConfigOptionFloats              filament_spool_weight;
     ConfigOptionFloats              filament_max_volumetric_speed;
     ConfigOptionFloats              filament_loading_speed;
     ConfigOptionFloats              filament_loading_speed_start;
@@ -759,6 +761,7 @@ protected:
         OPT_PTR(filament_type);
         OPT_PTR(filament_soluble);
         OPT_PTR(filament_cost);
+        OPT_PTR(filament_spool_weight);
         OPT_PTR(filament_max_volumetric_speed);
         OPT_PTR(filament_loading_speed);
         OPT_PTR(filament_loading_speed_start);