mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-06-15 16:33:10 +00:00
* Fix null-deref and arranger bugs that gate headless slicing tests export_gcode dereferenced a null result out-param, enum serialization dereferenced a null keys_map, and get_arrange_polys left bed_idx unseeded so the arranger dropped items. All only affect the headless test/CLI path. * Fix the headless test harness and add G-code test helpers Use the real arranger, fix temp-file handling with an RAII guard, and add layers_with_role / max_z for inspecting sliced G-code. * Re-enable the Model construction test * Re-enable SupportMaterial tests and add an enforced-support test * Re-enable and extend PrintObject layer-height and perimeter tests * Re-enable Print skirt, brim, and solid-surface tests * Re-enable and extend PrintGCode tests Un-hide the basic scenario (dead-key fixes, reframes, trimmed trivia) and add initial-layer-height, sequential-order, and null-result export tests. * Re-enable and reframe the skirt/brim tests Detect skirt/brim by G-code role comment instead of a sentinel speed, and resolve the previously-unfinished skirt-enclosure test. * Replace the stale lift()/unlift() test with a z_hop test * Delete the stub and broken Flow tests
304 lines
14 KiB
C++
304 lines
14 KiB
C++
#ifdef WIN32
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#ifndef NOMINMAX
|
|
#define NOMINMAX
|
|
#endif
|
|
#include <Windows.h>
|
|
#endif
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include "libslic3r/libslic3r.h"
|
|
#include "libslic3r/GCodeReader.hpp"
|
|
|
|
#include "test_data.hpp"
|
|
#include "test_utils.hpp"
|
|
|
|
#include <algorithm>
|
|
#include <boost/regex.hpp>
|
|
#include <boost/filesystem.hpp>
|
|
#include <fstream>
|
|
#include <iterator>
|
|
#include <set>
|
|
|
|
using namespace Slic3r;
|
|
using namespace Slic3r::Test;
|
|
|
|
boost::regex perimeters_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; perimeter");
|
|
boost::regex infill_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; infill");
|
|
boost::regex skirt_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; skirt");
|
|
|
|
SCENARIO( "PrintGCode basic functionality", "[PrintGCode]") {
|
|
GIVEN("A default configuration and a print test object") {
|
|
WHEN("the output is executed with no support material") {
|
|
Slic3r::Print print;
|
|
Slic3r::Model model;
|
|
Slic3r::Test::init_print({TestMesh::cube_20x20x20}, print, model, {
|
|
{ "layer_height", 0.2 },
|
|
{ "initial_layer_print_height", 0.2 },
|
|
{ "initial_layer_line_width", 0 },
|
|
{ "gcode_comments", true },
|
|
{ "machine_start_gcode", "" },
|
|
{ "z_hop", 0 }
|
|
});
|
|
std::string gcode = Slic3r::Test::gcode(print);
|
|
THEN("Some text output is generated.") {
|
|
REQUIRE(gcode.size() > 0);
|
|
}
|
|
//THEN("Exported text contains git commit id") {
|
|
// REQUIRE(gcode.find("; Git Commit") != std::string::npos);
|
|
// REQUIRE(gcode.find(SLIC3R_BUILD_ID) != std::string::npos);
|
|
//}
|
|
THEN("Exported text contains extrusion statistics.") {
|
|
REQUIRE(gcode.find("; external perimeters extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; perimeters extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; solid infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; top infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; support material extrusion width") == std::string::npos);
|
|
REQUIRE(gcode.find("; first layer extrusion width") == std::string::npos);
|
|
}
|
|
THEN("Exported text does not contain cooling markers (they were consumed)") {
|
|
REQUIRE(gcode.find(";_EXTRUDE_SET_SPEED") == std::string::npos);
|
|
}
|
|
|
|
THEN("The config trailer includes print and region settings") {
|
|
REQUIRE(gcode.find("; layer_height") != std::string::npos);
|
|
REQUIRE(gcode.find("; sparse_infill_density") != std::string::npos);
|
|
}
|
|
THEN("Infill is emitted.") {
|
|
boost::smatch has_match;
|
|
REQUIRE(boost::regex_search(gcode, has_match, infill_regex));
|
|
}
|
|
THEN("Perimeters are emitted.") {
|
|
boost::smatch has_match;
|
|
REQUIRE(boost::regex_search(gcode, has_match, perimeters_regex));
|
|
}
|
|
THEN("Skirt is emitted.") {
|
|
boost::smatch has_match;
|
|
REQUIRE(boost::regex_search(gcode, has_match, skirt_regex));
|
|
}
|
|
THEN("final Z height is 20mm") {
|
|
REQUIRE_THAT(max_z(gcode), Catch::Matchers::WithinAbs(20., 1e-4));
|
|
}
|
|
}
|
|
WHEN("output is executed with two objects printed sequentially") {
|
|
Slic3r::Print print;
|
|
Slic3r::Model model;
|
|
Slic3r::Test::init_print({TestMesh::cube_20x20x20,TestMesh::cube_20x20x20}, print, model, {
|
|
{ "initial_layer_line_width", 0 },
|
|
{ "initial_layer_print_height", 0.3 },
|
|
{ "layer_height", 0.2 },
|
|
{ "enable_support", false },
|
|
{ "raft_layers", 0 },
|
|
{ "print_sequence", "by object" },
|
|
{ "gcode_comments", true },
|
|
{ "printing_by_object_gcode", "; between-object-gcode" },
|
|
{ "z_hop", 0 }
|
|
});
|
|
std::string gcode = Slic3r::Test::gcode(print);
|
|
THEN("Some text output is generated.") {
|
|
REQUIRE(gcode.size() > 0);
|
|
}
|
|
THEN("Infill is emitted.") {
|
|
boost::smatch has_match;
|
|
REQUIRE(boost::regex_search(gcode, has_match, infill_regex));
|
|
}
|
|
THEN("Perimeters are emitted.") {
|
|
boost::smatch has_match;
|
|
REQUIRE(boost::regex_search(gcode, has_match, perimeters_regex));
|
|
}
|
|
THEN("Skirt is emitted.") {
|
|
boost::smatch has_match;
|
|
REQUIRE(boost::regex_search(gcode, has_match, skirt_regex));
|
|
}
|
|
THEN("Between-object-gcode is emitted.") {
|
|
REQUIRE(gcode.find("; between-object-gcode") != std::string::npos);
|
|
}
|
|
THEN("final Z height is 20.1mm") {
|
|
REQUIRE_THAT(max_z(gcode), Catch::Matchers::WithinAbs(20.1, 1e-4));
|
|
}
|
|
THEN("Z height resets on object change") {
|
|
double final_z = 0.0;
|
|
bool reset = false;
|
|
GCodeReader reader;
|
|
reader.apply_config(print.config());
|
|
reader.parse_buffer(gcode, [&final_z, &reset] (GCodeReader& self, const GCodeReader::GCodeLine& line) {
|
|
if (final_z > 0 && std::abs(self.z() - 0.3) < 0.01 ) { // saw higher Z before this, now it's lower
|
|
reset = true;
|
|
} else {
|
|
final_z = std::max(final_z, static_cast<double>(self.z())); // record the highest Z point we reach
|
|
}
|
|
});
|
|
REQUIRE(reset == true);
|
|
}
|
|
}
|
|
WHEN("the output is executed with support material") {
|
|
std::string gcode = ::Test::slice({TestMesh::cube_20x20x20}, {
|
|
{ "initial_layer_line_width", 0 },
|
|
{ "enable_support", true },
|
|
{ "raft_layers", 3 },
|
|
{ "gcode_comments", true }
|
|
});
|
|
THEN("Some text output is generated.") {
|
|
REQUIRE(gcode.size() > 0);
|
|
}
|
|
THEN("Exported text contains extrusion statistics.") {
|
|
REQUIRE(gcode.find("; external perimeters extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; perimeters extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; solid infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; top infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; support material extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; first layer extrusion width") == std::string::npos);
|
|
}
|
|
THEN("Raft is emitted.") {
|
|
REQUIRE(gcode.find("; raft") != std::string::npos);
|
|
}
|
|
}
|
|
WHEN("the output is executed with a separate first layer extrusion width") {
|
|
std::string gcode = ::Test::slice({ TestMesh::cube_20x20x20 }, {
|
|
{ "initial_layer_line_width", "0.5" }
|
|
});
|
|
THEN("Some text output is generated.") {
|
|
REQUIRE(gcode.size() > 0);
|
|
}
|
|
THEN("Exported text contains extrusion statistics.") {
|
|
REQUIRE(gcode.find("; external perimeters extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; perimeters extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; solid infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; top infill extrusion width") != std::string::npos);
|
|
REQUIRE(gcode.find("; support material extrusion width") == std::string::npos);
|
|
REQUIRE(gcode.find("; first layer extrusion width") != std::string::npos);
|
|
}
|
|
}
|
|
WHEN("Cooling is enabled and the fan is disabled.") {
|
|
std::string gcode = ::Test::slice({ TestMesh::cube_20x20x20 }, {
|
|
{ "cooling", true },
|
|
{ "close_fan_the_first_x_layers", 5 }
|
|
});
|
|
THEN("GCode to disable fan is emitted."){
|
|
REQUIRE(gcode.find("M106 S0") != std::string::npos);
|
|
}
|
|
}
|
|
WHEN("end_gcode exists with layer_num and layer_z") {
|
|
std::string gcode = ::Test::slice({ TestMesh::cube_20x20x20 }, {
|
|
{ "machine_end_gcode", "; Layer_num [layer_num]\n; Layer_z [layer_z]" },
|
|
{ "layer_height", 0.1 },
|
|
{ "initial_layer_print_height", 0.1 }
|
|
});
|
|
THEN("layer_num and layer_z are processed in the end gcode") {
|
|
REQUIRE(gcode.find("; Layer_num 199") != std::string::npos);
|
|
REQUIRE(gcode.find("; Layer_z 20") != std::string::npos);
|
|
}
|
|
}
|
|
WHEN("current_extruder exists in start_gcode") {
|
|
std::string gcode = ::Test::slice({ TestMesh::cube_20x20x20 }, {
|
|
{ "machine_start_gcode", "; Extruder [current_extruder]" }
|
|
});
|
|
THEN("current_extruder is processed in the start gcode and set for first extruder") {
|
|
REQUIRE(gcode.find("; Extruder 0") != std::string::npos);
|
|
}
|
|
}
|
|
|
|
WHEN("layer_num represents the layer's index from z=0") {
|
|
std::string gcode = ::Test::slice({ TestMesh::cube_20x20x20, TestMesh::cube_20x20x20 }, {
|
|
{ "print_sequence", "by object" },
|
|
{ "gcode_comments", true },
|
|
{ "layer_change_gcode", ";Layer:[layer_num] ([layer_z] mm)" },
|
|
{ "layer_height", 0.1 },
|
|
{ "initial_layer_print_height", 0.1 }
|
|
});
|
|
// End of the 1st object.
|
|
std::string token = ";Layer:199 ";
|
|
size_t pos = gcode.find(token);
|
|
THEN("First and second object last layer is emitted") {
|
|
// First object
|
|
REQUIRE(pos != std::string::npos);
|
|
pos += token.size();
|
|
REQUIRE(pos < gcode.size());
|
|
double z = 0;
|
|
REQUIRE((sscanf(gcode.data() + pos, "(%lf mm)", &z) == 1));
|
|
REQUIRE_THAT(z, Catch::Matchers::WithinAbs(20., 1e-4));
|
|
// Second object
|
|
pos = gcode.find(";Layer:399 ", pos);
|
|
REQUIRE(pos != std::string::npos);
|
|
pos += token.size();
|
|
REQUIRE(pos < gcode.size());
|
|
REQUIRE((sscanf(gcode.data() + pos, "(%lf mm)", &z) == 1));
|
|
REQUIRE_THAT(z, Catch::Matchers::WithinAbs(20., 1e-4));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
TEST_CASE("export_gcode writes G-code without a result pointer", "[PrintGCode][export_gcode]")
|
|
{
|
|
Print print;
|
|
Model model;
|
|
Slic3r::Test::init_print({TestMesh::cube_20x20x20}, print, model);
|
|
print.process();
|
|
|
|
SECTION("non-BBL printer") {}
|
|
SECTION("BBL printer") { print.is_BBL_printer() = true; }
|
|
|
|
ScopedTemporaryFile temp(".gcode");
|
|
REQUIRE_NOTHROW(print.export_gcode(temp.string(), nullptr, nullptr));
|
|
|
|
std::ifstream in(temp.string());
|
|
const std::string gcode((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
|
|
|
|
REQUIRE_FALSE(gcode.empty());
|
|
}
|
|
|
|
TEST_CASE("Initial layer height is honored", "[PrintGCode]")
|
|
{
|
|
const std::string gcode = Slic3r::Test::slice({TestMesh::cube_20x20x20}, {
|
|
{ "initial_layer_print_height", 0.3 },
|
|
{ "layer_height", 0.2 },
|
|
{ "z_hop", 0 } // keep recorded Z equal to the printed layer height
|
|
});
|
|
|
|
std::set<double> layer_zs;
|
|
GCodeReader reader;
|
|
reader.parse_buffer(gcode, [&layer_zs] (GCodeReader& self, const GCodeReader::GCodeLine& line) {
|
|
if (line.extruding(self) && line.dist_XY(self) > 0)
|
|
layer_zs.insert(self.z());
|
|
});
|
|
|
|
REQUIRE(layer_zs.size() > 1);
|
|
REQUIRE_THAT(*layer_zs.begin(), Catch::Matchers::WithinAbs(0.3, 1e-4));
|
|
REQUIRE_THAT(*std::next(layer_zs.begin()), Catch::Matchers::WithinAbs(0.5, 1e-4));
|
|
}
|
|
|
|
TEST_CASE("Sequential printing follows model order", "[PrintGCode]")
|
|
{
|
|
// Two objects of different heights, taller one added first. Orca prints
|
|
// sequential objects in model order, so the taller one is printed first.
|
|
const std::string gcode = Slic3r::Test::slice({ Slic3r::make_cube(20, 20, 20), Slic3r::make_cube(20, 20, 10) }, {
|
|
{ "print_sequence", "by object" },
|
|
{ "layer_height", 0.2 },
|
|
{ "initial_layer_print_height", 0.2 },
|
|
{ "z_hop", 0 }
|
|
});
|
|
|
|
// The first object's height is the peak Z reached before Z drops back to the
|
|
// first layer (the object change). With by-object printing only an object
|
|
// change returns Z to the bottom.
|
|
double first_object_peak_z = 0.0;
|
|
double running_peak = 0.0;
|
|
GCodeReader reader;
|
|
reader.parse_buffer(gcode, [&] (GCodeReader& self, const GCodeReader::GCodeLine& line) {
|
|
if (first_object_peak_z != 0.0 || !line.extruding(self)) return; // ignore travels (e.g. start-gcode Z lift)
|
|
if (running_peak > 1.0 && self.z() < 1.0)
|
|
first_object_peak_z = running_peak;
|
|
else
|
|
running_peak = std::max(running_peak, static_cast<double>(self.z()));
|
|
});
|
|
|
|
REQUIRE_THAT(first_object_peak_z, Catch::Matchers::WithinAbs(20.0, 0.3));
|
|
}
|