84b28a25e8
config bundles, project files (3MFs, AMFs). When loading these files, the caller may decide whether to substitute some of the configuration values the current PrusaSlicer version does not understand with some reasonable default value, and whether to report it. If substitution is disabled, an exception is being thrown as before this commit. If substitution is enabled, list of substitutions is returned by the API to be presented to the user. This allows us to introduce for example new firmware flavor key in PrusaSlicer 2.4 while letting PrusaSlicer 2.3.2 to fall back to some default and to report it to the user. As a preparation for PrusaSlicer 2.4.0, the new firmware_flavor "marlinfirmware" (signifying Marlin 2.0 and newer) that is not supported by 2.3.2 yet will default to "marlin" (signifying legacy Marlin). When slicing from command line, substutions are performed by default and reported into the console, however substitutions may be either disabled or made silent with the new "config-compatibility" command line option. Substitute enums and bools only. Allow booleans to be parsed as true: "1", "enabled", "on" case insensitive false: "0", "disabled", "off" case insensitive This will allow us in the future for example to switch the draft_shield boolean to an enum with the following values: "disabled" / "enabled" / "limited". Added "enum_bitmask.hpp" - support for type safe sets of options. See for example PresetBundle::load_configbundle(... LoadConfigBundleAttributes flags) for an example of intended usage. WIP: GUI for reporting the list of config substitutions needs to be implemented by @YuSanka.
203 lines
8.9 KiB
C++
203 lines
8.9 KiB
C++
#include <catch2/catch.hpp>
|
|
|
|
#include <numeric>
|
|
#include <sstream>
|
|
|
|
#include "test_data.hpp" // get access to init_print, etc
|
|
|
|
#include "libslic3r/Config.hpp"
|
|
#include "libslic3r/Model.hpp"
|
|
#include "libslic3r/Config.hpp"
|
|
#include "libslic3r/GCodeReader.hpp"
|
|
#include "libslic3r/Flow.hpp"
|
|
#include "libslic3r/libslic3r.h"
|
|
|
|
using namespace Slic3r::Test;
|
|
using namespace Slic3r;
|
|
|
|
SCENARIO("Extrusion width specifics", "[Flow]") {
|
|
GIVEN("A config with a skirt, brim, some fill density, 3 perimeters, and 1 bottom solid layer and a 20mm cube mesh") {
|
|
// this is a sharedptr
|
|
DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
|
|
config.set_deserialize_strict({
|
|
{ "brim_width", 2 },
|
|
{ "skirts", 1 },
|
|
{ "perimeters", 3 },
|
|
{ "fill_density", "40%" },
|
|
{ "first_layer_height", "100%" }
|
|
});
|
|
|
|
WHEN("first layer width set to 2mm") {
|
|
Slic3r::Model model;
|
|
config.set("first_layer_extrusion_width", 2);
|
|
Slic3r::Print print;
|
|
Slic3r::Test::init_print({TestMesh::cube_20x20x20}, print, model, config);
|
|
|
|
std::vector<double> E_per_mm_bottom;
|
|
std::string gcode = Test::gcode(print);
|
|
Slic3r::GCodeReader parser;
|
|
const double layer_height = config.opt_float("layer_height");
|
|
parser.parse_buffer(gcode, [&E_per_mm_bottom, layer_height] (Slic3r::GCodeReader& self, const Slic3r::GCodeReader::GCodeLine& line)
|
|
{
|
|
if (self.z() == Approx(layer_height).margin(0.01)) { // only consider first layer
|
|
if (line.extruding(self) && line.dist_XY(self) > 0) {
|
|
E_per_mm_bottom.emplace_back(line.dist_E(self) / line.dist_XY(self));
|
|
}
|
|
}
|
|
});
|
|
THEN(" First layer width applies to everything on first layer.") {
|
|
bool pass = false;
|
|
double avg_E = std::accumulate(E_per_mm_bottom.cbegin(), E_per_mm_bottom.cend(), 0.0) / static_cast<double>(E_per_mm_bottom.size());
|
|
|
|
pass = (std::count_if(E_per_mm_bottom.cbegin(), E_per_mm_bottom.cend(), [avg_E] (const double& v) { return v == Approx(avg_E); }) == 0);
|
|
REQUIRE(pass == true);
|
|
REQUIRE(E_per_mm_bottom.size() > 0); // make sure it actually passed because of extrusion
|
|
}
|
|
THEN(" First layer width does not apply to upper layer.") {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// needs gcode export
|
|
SCENARIO(" Bridge flow specifics.", "[Flow]") {
|
|
GIVEN("A default config with no cooling and a fixed bridge speed, flow ratio and an overhang mesh.") {
|
|
WHEN("bridge_flow_ratio is set to 1.0") {
|
|
THEN("Output flow is as expected.") {
|
|
}
|
|
}
|
|
WHEN("bridge_flow_ratio is set to 0.5") {
|
|
THEN("Output flow is as expected.") {
|
|
}
|
|
}
|
|
WHEN("bridge_flow_ratio is set to 2.0") {
|
|
THEN("Output flow is as expected.") {
|
|
}
|
|
}
|
|
}
|
|
GIVEN("A default config with no cooling and a fixed bridge speed, flow ratio, fixed extrusion width of 0.4mm and an overhang mesh.") {
|
|
WHEN("bridge_flow_ratio is set to 1.0") {
|
|
THEN("Output flow is as expected.") {
|
|
}
|
|
}
|
|
WHEN("bridge_flow_ratio is set to 0.5") {
|
|
THEN("Output flow is as expected.") {
|
|
}
|
|
}
|
|
WHEN("bridge_flow_ratio is set to 2.0") {
|
|
THEN("Output flow is as expected.") {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Test the expected behavior for auto-width,
|
|
/// spacing, etc
|
|
SCENARIO("Flow: Flow math for non-bridges", "[Flow]") {
|
|
GIVEN("Nozzle Diameter of 0.4, a desired width of 1mm and layer height of 0.5") {
|
|
ConfigOptionFloatOrPercent width(1.0, false);
|
|
float nozzle_diameter = 0.4f;
|
|
float bridge_flow = 0.f;
|
|
float layer_height = 0.5f;
|
|
|
|
// Spacing for non-bridges is has some overlap
|
|
THEN("External perimeter flow has spacing fixed to 1.125 * nozzle_diameter") {
|
|
auto flow = Flow::new_from_config_width(frExternalPerimeter, ConfigOptionFloatOrPercent(0, false), nozzle_diameter, layer_height, bridge_flow);
|
|
REQUIRE(flow.spacing() == Approx(1.125 * nozzle_diameter - layer_height * (1.0 - PI / 4.0)));
|
|
}
|
|
|
|
THEN("Internal perimeter flow has spacing fixed to 1.125 * nozzle_diameter") {
|
|
auto flow = Flow::new_from_config_width(frPerimeter, ConfigOptionFloatOrPercent(0, false), nozzle_diameter, layer_height, bridge_flow);
|
|
REQUIRE(flow.spacing() == Approx(1.125 *nozzle_diameter - layer_height * (1.0 - PI / 4.0)));
|
|
}
|
|
THEN("Spacing for supplied width is 0.8927f") {
|
|
auto flow = Flow::new_from_config_width(frExternalPerimeter, width, nozzle_diameter, layer_height, bridge_flow);
|
|
REQUIRE(flow.spacing() == Approx(width.value - layer_height * (1.0 - PI / 4.0)));
|
|
flow = Flow::new_from_config_width(frPerimeter, width, nozzle_diameter, layer_height, bridge_flow);
|
|
REQUIRE(flow.spacing() == Approx(width.value - layer_height * (1.0 - PI / 4.0)));
|
|
}
|
|
}
|
|
/// Check the min/max
|
|
GIVEN("Nozzle Diameter of 0.25") {
|
|
float nozzle_diameter = 0.25f;
|
|
float bridge_flow = 0.f;
|
|
float layer_height = 0.5f;
|
|
WHEN("layer height is set to 0.2") {
|
|
layer_height = 0.15f;
|
|
THEN("Max width is set.") {
|
|
auto flow = Flow::new_from_config_width(frPerimeter, ConfigOptionFloatOrPercent(0, false), nozzle_diameter, layer_height, bridge_flow);
|
|
REQUIRE(flow.width == Approx(1.125 * nozzle_diameter));
|
|
}
|
|
}
|
|
WHEN("Layer height is set to 0.2") {
|
|
layer_height = 0.3f;
|
|
THEN("Min width is set.") {
|
|
auto flow = Flow::new_from_config_width(frPerimeter, ConfigOptionFloatOrPercent(0, false), nozzle_diameter, layer_height, bridge_flow);
|
|
REQUIRE(flow.width == Approx(1.125 * nozzle_diameter));
|
|
}
|
|
}
|
|
}
|
|
|
|
#if 0
|
|
/// Check for an edge case in the maths where the spacing could be 0; original
|
|
/// math is 0.99. Slic3r issue #4654
|
|
GIVEN("Input spacing of 0.414159 and a total width of 2") {
|
|
double in_spacing = 0.414159;
|
|
double total_width = 2.0;
|
|
auto flow = Flow::new_from_spacing(1.0, 0.4, 0.3, false);
|
|
WHEN("solid_spacing() is called") {
|
|
double result = flow.solid_spacing(total_width, in_spacing);
|
|
THEN("Yielded spacing is greater than 0") {
|
|
REQUIRE(result > 0);
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
}
|
|
|
|
/// Spacing, width calculation for bridge extrusions
|
|
SCENARIO("Flow: Flow math for bridges", "[Flow]") {
|
|
GIVEN("Nozzle Diameter of 0.4, a desired width of 1mm and layer height of 0.5") {
|
|
auto width = ConfigOptionFloatOrPercent(1.0, false);
|
|
float nozzle_diameter = 0.4f;
|
|
float bridge_flow = 1.0f;
|
|
float layer_height = 0.5f;
|
|
WHEN("Flow role is frExternalPerimeter") {
|
|
auto flow = Flow::new_from_config_width(frExternalPerimeter, width, nozzle_diameter, layer_height, bridge_flow);
|
|
THEN("Bridge width is same as nozzle diameter") {
|
|
REQUIRE(flow.width == Approx(nozzle_diameter));
|
|
}
|
|
THEN("Bridge spacing is same as nozzle diameter + BRIDGE_EXTRA_SPACING") {
|
|
REQUIRE(flow.spacing() == Approx(nozzle_diameter + BRIDGE_EXTRA_SPACING));
|
|
}
|
|
}
|
|
WHEN("Flow role is frInfill") {
|
|
auto flow = Flow::new_from_config_width(frInfill, width, nozzle_diameter, layer_height, bridge_flow);
|
|
THEN("Bridge width is same as nozzle diameter") {
|
|
REQUIRE(flow.width == Approx(nozzle_diameter));
|
|
}
|
|
THEN("Bridge spacing is same as nozzle diameter + BRIDGE_EXTRA_SPACING") {
|
|
REQUIRE(flow.spacing() == Approx(nozzle_diameter + BRIDGE_EXTRA_SPACING));
|
|
}
|
|
}
|
|
WHEN("Flow role is frPerimeter") {
|
|
auto flow = Flow::new_from_config_width(frPerimeter, width, nozzle_diameter, layer_height, bridge_flow);
|
|
THEN("Bridge width is same as nozzle diameter") {
|
|
REQUIRE(flow.width == Approx(nozzle_diameter));
|
|
}
|
|
THEN("Bridge spacing is same as nozzle diameter + BRIDGE_EXTRA_SPACING") {
|
|
REQUIRE(flow.spacing() == Approx(nozzle_diameter + BRIDGE_EXTRA_SPACING));
|
|
}
|
|
}
|
|
WHEN("Flow role is frSupportMaterial") {
|
|
auto flow = Flow::new_from_config_width(frSupportMaterial, width, nozzle_diameter, layer_height, bridge_flow);
|
|
THEN("Bridge width is same as nozzle diameter") {
|
|
REQUIRE(flow.width == Approx(nozzle_diameter));
|
|
}
|
|
THEN("Bridge spacing is same as nozzle diameter + BRIDGE_EXTRA_SPACING") {
|
|
REQUIRE(flow.spacing() == Approx(nozzle_diameter + BRIDGE_EXTRA_SPACING));
|
|
}
|
|
}
|
|
}
|
|
}
|