mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-30 14:22:07 +00:00
Merge branch 'main' into feature/texture_displacement
This commit is contained in:
@@ -12,6 +12,8 @@ add_executable(${_TEST_NAME}_tests
|
||||
test_clipper_offset.cpp
|
||||
test_clipper_utils.cpp
|
||||
test_config.cpp
|
||||
test_config_variant_expansion.cpp
|
||||
test_toolordering_nozzle_group.cpp
|
||||
test_preset_bundle_loading.cpp
|
||||
test_preset_setting_id.cpp
|
||||
test_elephant_foot_compensation.cpp
|
||||
@@ -20,6 +22,7 @@ add_executable(${_TEST_NAME}_tests
|
||||
test_polygon.cpp
|
||||
test_mutable_polygon.cpp
|
||||
test_mutable_priority_queue.cpp
|
||||
test_nozzle_volume_type.cpp
|
||||
test_stl.cpp
|
||||
test_meshboolean.cpp
|
||||
test_marchingsquares.cpp
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
|
||||
#include "libslic3r/Model.hpp"
|
||||
#include "libslic3r/Format/3mf.hpp"
|
||||
#include "libslic3r/Format/bbs_3mf.hpp"
|
||||
#include "libslic3r/Format/STL.hpp"
|
||||
#include "libslic3r/PrintConfig.hpp"
|
||||
#include "libslic3r/Semver.hpp"
|
||||
#include "libslic3r/Preset.hpp"
|
||||
#include "libslic3r/MultiNozzleUtils.hpp"
|
||||
#include "libslic3r/ProjectTask.hpp"
|
||||
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
|
||||
@@ -133,6 +139,376 @@ SCENARIO("Export+Import geometry to/from 3mf file cycle", "[3mf]") {
|
||||
}
|
||||
}
|
||||
|
||||
// .3mf multi-nozzle round-trip.
|
||||
// Locks the load/save handling for the H2C multi-nozzle plate metadata:
|
||||
// * filament_volume_maps -> plate config "filament_volume_map" (with the >1 -> 0 clamp)
|
||||
// * nozzle_volume_type -> PlateData::nozzle_volume_types (previously write-only)
|
||||
// and pins the deliberately-lossy keys (enable_filament_dynamic_map) so a future change has to
|
||||
// consciously unpin them. Uses a store_bbs_3mf -> load_bbs_3mf cycle (no external fixture needed).
|
||||
SCENARIO("H2C multi-nozzle .3mf round-trip", "[3mf][MultiNozzle]") {
|
||||
GIVEN("a plate carrying multi-nozzle filament assignment metadata") {
|
||||
Model model;
|
||||
std::string src_file = std::string(TEST_DATA_DIR) + "/test_3mf/Prusa.stl";
|
||||
REQUIRE(load_stl(src_file.c_str(), &model));
|
||||
model.add_default_instances();
|
||||
|
||||
// store_bbs_3mf stages Metadata/project_settings.config through the model's backup path;
|
||||
// point it at a writable temp dir (the default lives under a read-only root in CI).
|
||||
std::string backup_dir =
|
||||
(boost::filesystem::temp_directory_path() / boost::filesystem::unique_path("orca_mn_%%%%%%%%")).string();
|
||||
boost::filesystem::create_directories(backup_dir);
|
||||
model.set_backup_path(backup_dir);
|
||||
|
||||
// Global (printer) config: give nozzle_volume_type a non-default value so the slice_info
|
||||
// read-back is a meaningful assertion (High Flow == 1).
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.set_key_value("nozzle_volume_type",
|
||||
new ConfigOptionEnumsGeneric({ (int) NozzleVolumeType::nvtHighFlow }));
|
||||
|
||||
PlateData* plate = new PlateData();
|
||||
plate->plate_index = 0;
|
||||
plate->is_sliced_valid = true; // gate for the slice_info.config writer (nozzle_volume_type)
|
||||
plate->filament_maps = { 1, 2, 1 }; // slice_info uses this; keep it == model_settings' value
|
||||
plate->config.set_key_value("filament_map_mode", new ConfigOptionEnum<FilamentMapMode>(fmmManual));
|
||||
plate->config.set_key_value("filament_map", new ConfigOptionInts({ 1, 2, 1 }));
|
||||
// Deliberately include out-of-range volume-type ids (2 == Hybrid, 3 == TPU High Flow):
|
||||
// the loader must clamp them back to Standard (0).
|
||||
plate->config.set_key_value("filament_volume_map", new ConfigOptionInts({ 0, 2, 1, 3 }));
|
||||
// Known-lossy: a true value must NOT survive the round-trip (slice_info hardcodes false,
|
||||
// model_settings never writes it).
|
||||
plate->config.set_key_value("enable_filament_dynamic_map", new ConfigOptionBool(true));
|
||||
|
||||
WHEN("stored to and reloaded from a .3mf") {
|
||||
std::string test_file = std::string(TEST_DATA_DIR) + "/test_3mf/mn_roundtrip.3mf";
|
||||
|
||||
StoreParams store_params;
|
||||
store_params.path = test_file.c_str();
|
||||
store_params.model = &model;
|
||||
store_params.config = &config;
|
||||
store_params.plate_data_list.push_back(plate);
|
||||
store_params.strategy = SaveStrategy::Zip64 | SaveStrategy::Silence;
|
||||
REQUIRE(store_bbs_3mf(store_params));
|
||||
|
||||
Model dst_model;
|
||||
DynamicPrintConfig dst_config;
|
||||
ConfigSubstitutionContext ctxt{ ForwardCompatibilitySubstitutionRule::Enable };
|
||||
PlateDataPtrs dst_plates;
|
||||
std::vector<Preset*> project_presets;
|
||||
bool is_bbl_3mf = false, is_orca_3mf = false;
|
||||
Semver file_version;
|
||||
// LoadConfig is required for slice_info.config (nozzle_volume_type) to be parsed —
|
||||
// matches how the app loads projects.
|
||||
bool loaded = load_bbs_3mf(test_file.c_str(), &dst_config, &ctxt, &dst_model, &dst_plates,
|
||||
&project_presets, &is_bbl_3mf, &is_orca_3mf, &file_version, nullptr,
|
||||
LoadStrategy::LoadModel | LoadStrategy::LoadConfig);
|
||||
boost::filesystem::remove(test_file);
|
||||
|
||||
THEN("every multi-nozzle key round-trips as expected") {
|
||||
REQUIRE(loaded);
|
||||
REQUIRE(dst_plates.size() >= 1);
|
||||
PlateData* rt = dst_plates.front();
|
||||
|
||||
// filament_map (model_settings + slice_info; already round-tripped)
|
||||
auto* fmap = rt->config.option<ConfigOptionInts>("filament_map");
|
||||
REQUIRE(fmap != nullptr);
|
||||
REQUIRE(fmap->values == std::vector<int>({ 1, 2, 1 }));
|
||||
|
||||
// filament_volume_map (model_settings) with the >1 -> 0 clamp
|
||||
auto* fvmap = rt->config.option<ConfigOptionInts>("filament_volume_map");
|
||||
REQUIRE(fvmap != nullptr);
|
||||
REQUIRE(fvmap->values == std::vector<int>({ 0, 0, 1, 0 }));
|
||||
|
||||
// nozzle_volume_type read-back into PlateData::nozzle_volume_types
|
||||
REQUIRE(rt->nozzle_volume_types == "1");
|
||||
|
||||
// enable_filament_dynamic_map pinned lossy: model_settings never serializes it and
|
||||
// slice_info hardcodes false, so the `true` we set is dropped. Pinned here
|
||||
// (absent or false, never true) so a future change that persists it must update this.
|
||||
auto* dyn = rt->config.option<ConfigOptionBool>("enable_filament_dynamic_map");
|
||||
const bool persisted_true = (dyn != nullptr && dyn->value);
|
||||
REQUIRE_FALSE(persisted_true);
|
||||
}
|
||||
|
||||
release_PlateData_list(dst_plates);
|
||||
}
|
||||
delete plate; // store_bbs_3mf does not take ownership of the source plate
|
||||
boost::filesystem::remove_all(backup_dir);
|
||||
}
|
||||
}
|
||||
|
||||
// Saved nozzle diameter for a single-nozzle-per-extruder printer with a non-standard nozzle.
|
||||
// The grouping result rounds every nozzle diameter to the nearest of {0.2,0.4,0.6,0.8} for its
|
||||
// internal matching key. That rounded value must NOT reach the saved <filament>/<nozzle> metadata on
|
||||
// a printer whose extruders each carry one nozzle: the exact per-extruder config diameter is written
|
||||
// instead, so a 0.5 mm nozzle is preserved rather than saved as 0.4. (Only an extruder that carries a
|
||||
// nozzle cluster, which the per-extruder config cannot express, keeps the grouping result's diameter.)
|
||||
SCENARIO("Non-standard nozzle diameter survives .3mf save on a single-nozzle printer", "[3mf][MultiNozzle]") {
|
||||
GIVEN("a single-extruder plate whose nozzle is 0.5 mm and whose stamped diameter was rounded to 0.4") {
|
||||
Model model;
|
||||
std::string src_file = std::string(TEST_DATA_DIR) + "/test_3mf/Prusa.stl";
|
||||
REQUIRE(load_stl(src_file.c_str(), &model));
|
||||
model.add_default_instances();
|
||||
|
||||
std::string backup_dir =
|
||||
(boost::filesystem::temp_directory_path() / boost::filesystem::unique_path("orca_nd_%%%%%%%%")).string();
|
||||
boost::filesystem::create_directories(backup_dir);
|
||||
model.set_backup_path(backup_dir);
|
||||
|
||||
// Single extruder with a non-standard 0.5 mm nozzle; extruder_max_nozzle_count stays at its
|
||||
// default (no nozzle cluster), so the writer must emit the exact config diameter.
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.set_key_value("nozzle_diameter", new ConfigOptionFloats({ 0.5 }));
|
||||
|
||||
PlateData* plate = new PlateData();
|
||||
plate->plate_index = 0;
|
||||
plate->is_sliced_valid = true; // gate for the slice_info.config writer
|
||||
plate->filament_maps = { 1 };
|
||||
|
||||
// Seed the stamped diameter with the grouping result's rounded value (0.5 -> 0.4) so the
|
||||
// assertion proves the writer ignores it and emits the exact config diameter instead.
|
||||
FilamentInfo fi;
|
||||
fi.id = 0;
|
||||
fi.type = "PLA";
|
||||
fi.color = "#FFFFFFFF";
|
||||
fi.group_id = { 0 };
|
||||
fi.nozzle_diameter = 0.4; // rounded; must NOT be the value written
|
||||
plate->slice_filaments_info.push_back(fi);
|
||||
|
||||
WHEN("stored to and reloaded from a .3mf") {
|
||||
std::string test_file = std::string(TEST_DATA_DIR) + "/test_3mf/nd_roundtrip.3mf";
|
||||
|
||||
StoreParams store_params;
|
||||
store_params.path = test_file.c_str();
|
||||
store_params.model = &model;
|
||||
store_params.config = &config;
|
||||
store_params.plate_data_list.push_back(plate);
|
||||
store_params.strategy = SaveStrategy::Zip64 | SaveStrategy::Silence;
|
||||
REQUIRE(store_bbs_3mf(store_params));
|
||||
|
||||
Model dst_model;
|
||||
DynamicPrintConfig dst_config;
|
||||
ConfigSubstitutionContext ctxt{ ForwardCompatibilitySubstitutionRule::Enable };
|
||||
PlateDataPtrs dst_plates;
|
||||
std::vector<Preset*> project_presets;
|
||||
bool is_bbl_3mf = false, is_orca_3mf = false;
|
||||
Semver file_version;
|
||||
bool loaded = load_bbs_3mf(test_file.c_str(), &dst_config, &ctxt, &dst_model, &dst_plates,
|
||||
&project_presets, &is_bbl_3mf, &is_orca_3mf, &file_version, nullptr,
|
||||
LoadStrategy::LoadModel | LoadStrategy::LoadConfig);
|
||||
boost::filesystem::remove(test_file);
|
||||
|
||||
THEN("the saved nozzle diameter is the exact 0.5, not the rounded 0.4") {
|
||||
REQUIRE(loaded);
|
||||
REQUIRE(dst_plates.size() >= 1);
|
||||
PlateData* rt = dst_plates.front();
|
||||
|
||||
// <nozzle> tag: device-facing per-nozzle diameter string, written verbatim.
|
||||
REQUIRE(rt->nozzles_info.size() >= 1);
|
||||
REQUIRE(rt->nozzles_info.front().diameter == "0.5");
|
||||
|
||||
// <filament> tag: per-filament nozzle_diameter parsed back as 0.5, not 0.4.
|
||||
REQUIRE(rt->slice_filaments_info.size() >= 1);
|
||||
REQUIRE_THAT(rt->slice_filaments_info.front().nozzle_diameter, Catch::Matchers::WithinAbs(0.5, 1e-6));
|
||||
}
|
||||
|
||||
release_PlateData_list(dst_plates);
|
||||
}
|
||||
delete plate; // store_bbs_3mf does not take ownership of the source plate
|
||||
boost::filesystem::remove_all(backup_dir);
|
||||
}
|
||||
}
|
||||
|
||||
// A legacy / foreign project (no multi-nozzle metadata) must load crash-safe through the BBS
|
||||
// importer and must not fabricate a filament_volume_map.
|
||||
SCENARIO("Legacy project loads crash-safe via load_bbs_3mf", "[3mf][MultiNozzle]") {
|
||||
GIVEN("a project without any multi-nozzle metadata") {
|
||||
std::string path = std::string(TEST_DATA_DIR) + "/test_3mf/Geräte/Büchse.3mf";
|
||||
Model model;
|
||||
DynamicPrintConfig config;
|
||||
ConfigSubstitutionContext ctxt{ ForwardCompatibilitySubstitutionRule::Enable };
|
||||
PlateDataPtrs plates;
|
||||
std::vector<Preset*> project_presets;
|
||||
bool is_bbl_3mf = false, is_orca_3mf = false;
|
||||
Semver file_version;
|
||||
|
||||
WHEN("loaded through the BBS importer") {
|
||||
bool loaded = false;
|
||||
REQUIRE_NOTHROW(loaded = load_bbs_3mf(path.c_str(), &config, &ctxt, &model, &plates,
|
||||
&project_presets, &is_bbl_3mf, &is_orca_3mf,
|
||||
&file_version, nullptr,
|
||||
LoadStrategy::LoadModel | LoadStrategy::LoadConfig));
|
||||
THEN("it does not crash and invents no per-filament volume map") {
|
||||
for (PlateData* p : plates) {
|
||||
REQUIRE(p->config.option<ConfigOptionInts>("filament_volume_map") == nullptr);
|
||||
}
|
||||
}
|
||||
release_PlateData_list(plates);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Device-side nozzle-grouping serialization surface.
|
||||
// Direct unit coverage for the pure serialize/deserialize + StaticNozzleGroupResult helpers that the
|
||||
// gcode.3mf writer/reader lean on.
|
||||
SCENARIO("MultiNozzle serialization helpers", "[3mf][MultiNozzle]") {
|
||||
using namespace Slic3r::MultiNozzleUtils;
|
||||
|
||||
GIVEN("NozzleInfo / NozzleGroupInfo") {
|
||||
NozzleInfo n0; n0.group_id = 0; n0.extruder_id = 0; n0.diameter = "0.4"; n0.volume_type = nvtStandard;
|
||||
NozzleInfo n1; n1.group_id = 1; n1.extruder_id = 1; n1.diameter = "0.4"; n1.volume_type = nvtHighFlow;
|
||||
|
||||
THEN("NozzleInfo::serialize matches the <nozzle> tag attributes (extruder_id 1-based)") {
|
||||
REQUIRE(n0.serialize() == "id=\"0\" extruder_id=\"1\" nozzle_diameter=\"0.4\" volume_type=\"Standard\"");
|
||||
REQUIRE(n1.serialize() == "id=\"1\" extruder_id=\"2\" nozzle_diameter=\"0.4\" volume_type=\"High Flow\"");
|
||||
}
|
||||
THEN("NozzleGroupInfo serialize/deserialize round-trips and rejects malformed input") {
|
||||
NozzleGroupInfo g("0.4", nvtHighFlow, 1, 3);
|
||||
REQUIRE(g.serialize() == "1-0.4-High Flow-3");
|
||||
auto rt = NozzleGroupInfo::deserialize(g.serialize());
|
||||
REQUIRE(rt.has_value());
|
||||
REQUIRE(*rt == g);
|
||||
REQUIRE_FALSE(NozzleGroupInfo::deserialize("1-0.4-Standard").has_value()); // too few tokens
|
||||
REQUIRE_FALSE(NozzleGroupInfo::deserialize("x-0.4-Standard-3").has_value()); // non-numeric extruder
|
||||
}
|
||||
}
|
||||
|
||||
GIVEN("a StaticNozzleGroupResult built from filament + nozzle infos") {
|
||||
std::vector<NozzleInfo> nozzles;
|
||||
{ NozzleInfo n; n.group_id = 0; n.extruder_id = 0; n.diameter = "0.4"; n.volume_type = nvtStandard; nozzles.push_back(n); }
|
||||
{ NozzleInfo n; n.group_id = 1; n.extruder_id = 1; n.diameter = "0.4"; n.volume_type = nvtHighFlow; nozzles.push_back(n); }
|
||||
|
||||
std::vector<FilamentInfo> filaments(3);
|
||||
filaments[0].id = 0; filaments[0].group_id = { 0 };
|
||||
filaments[1].id = 1; filaments[1].group_id = { 1 };
|
||||
filaments[2].id = 2; filaments[2].group_id = { 0, 1 };
|
||||
|
||||
auto result = StaticNozzleGroupResult::create(filaments, nozzles, { 0, 1, 2 }, { 0, 1, 0 }, false);
|
||||
REQUIRE(result.has_value());
|
||||
|
||||
THEN("filament->nozzle queries resolve to the stored mapping") {
|
||||
REQUIRE(result->get_extruder_count() == 2);
|
||||
REQUIRE(result->get_used_extruders() == std::vector<int>({ 0, 1 }));
|
||||
REQUIRE(result->get_used_filaments() == std::vector<unsigned int>({ 0, 1, 2 }));
|
||||
REQUIRE(result->get_nozzles_for_filament(0).size() == 1);
|
||||
REQUIRE(result->get_nozzles_for_filament(2).size() == 2);
|
||||
// first-use resolves through the (filament,nozzle) change sequences.
|
||||
auto first = result->get_first_nozzle_for_filament(1);
|
||||
REQUIRE(first.has_value());
|
||||
REQUIRE(first->group_id == 1);
|
||||
}
|
||||
THEN("empty inputs yield nullopt") {
|
||||
REQUIRE_FALSE(StaticNozzleGroupResult::create({}, nozzles, {}, {}, false).has_value());
|
||||
REQUIRE_FALSE(StaticNozzleGroupResult::create(filaments, {}, {}, {}, false).has_value());
|
||||
}
|
||||
}
|
||||
|
||||
GIVEN("load_nozzle_infos_with_compatibility fallbacks") {
|
||||
std::vector<NozzleInfo> new_format;
|
||||
{ NozzleInfo n; n.group_id = 1; n.extruder_id = 1; n.diameter = "0.4"; n.volume_type = nvtHighFlow; new_format.push_back(n); }
|
||||
{ NozzleInfo n; n.group_id = 0; n.extruder_id = 0; n.diameter = "0.4"; n.volume_type = nvtStandard; new_format.push_back(n); }
|
||||
|
||||
THEN("new-format <nozzle> tags are returned sorted by logical id") {
|
||||
auto out = load_nozzle_infos_with_compatibility(new_format, {}, {}, {}, {});
|
||||
REQUIRE(out.size() == 2);
|
||||
REQUIRE(out[0].group_id == 0);
|
||||
REQUIRE(out[1].group_id == 1);
|
||||
}
|
||||
THEN("oldest single-nozzle 3mf (no tags, no filament group_id) rebuilds from diameters/volume types") {
|
||||
std::vector<NozzleVolumeType> vt = { nvtStandard, nvtHighFlow };
|
||||
std::vector<double> dia = { 0.4, 0.4 };
|
||||
auto out = load_nozzle_infos_with_compatibility({}, {}, {}, vt, dia);
|
||||
REQUIRE(out.size() == 2);
|
||||
REQUIRE(out[0].extruder_id == 0);
|
||||
REQUIRE(out[0].volume_type == nvtStandard);
|
||||
REQUIRE(out[1].volume_type == nvtHighFlow);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The layer-aware grouping result must survive the gcode.3mf write/read as
|
||||
// <nozzle> tags and the enable_filament_dynamic_map flag. Proves the parse_filament_info stamping,
|
||||
// the NOZZLE_TAG writer, the _handle_config_nozzle reader, and the nozzles_info plate copy.
|
||||
SCENARIO("Nozzle-group metadata .3mf round-trip", "[3mf][MultiNozzle]") {
|
||||
GIVEN("a plate carrying a two-nozzle LayeredNozzleGroupResult") {
|
||||
Model model;
|
||||
std::string src_file = std::string(TEST_DATA_DIR) + "/test_3mf/Prusa.stl";
|
||||
REQUIRE(load_stl(src_file.c_str(), &model));
|
||||
model.add_default_instances();
|
||||
|
||||
std::string backup_dir =
|
||||
(boost::filesystem::temp_directory_path() / boost::filesystem::unique_path("orca_ng_%%%%%%%%")).string();
|
||||
boost::filesystem::create_directories(backup_dir);
|
||||
model.set_backup_path(backup_dir);
|
||||
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
|
||||
std::vector<MultiNozzleUtils::NozzleInfo> nozzles;
|
||||
{ MultiNozzleUtils::NozzleInfo n; n.group_id = 0; n.extruder_id = 0; n.diameter = "0.4"; n.volume_type = NozzleVolumeType::nvtStandard; nozzles.push_back(n); }
|
||||
{ MultiNozzleUtils::NozzleInfo n; n.group_id = 1; n.extruder_id = 1; n.diameter = "0.4"; n.volume_type = NozzleVolumeType::nvtHighFlow; nozzles.push_back(n); }
|
||||
auto group = MultiNozzleUtils::LayeredNozzleGroupResult::create(
|
||||
std::vector<int>{ 0, 1, 0 }, nozzles, std::vector<unsigned int>{ 0, 1, 2 });
|
||||
REQUIRE(group.has_value());
|
||||
|
||||
PlateData* plate = new PlateData();
|
||||
plate->plate_index = 0;
|
||||
plate->is_sliced_valid = true;
|
||||
plate->filament_maps = { 1, 2, 1 };
|
||||
plate->nozzle_group_result = group;
|
||||
plate->config.set_key_value("filament_map_mode", new ConfigOptionEnum<FilamentMapMode>(fmmManual));
|
||||
plate->config.set_key_value("filament_map", new ConfigOptionInts({ 1, 2, 1 }));
|
||||
|
||||
WHEN("stored to and reloaded from a .3mf") {
|
||||
std::string test_file = std::string(TEST_DATA_DIR) + "/test_3mf/ng_roundtrip.3mf";
|
||||
|
||||
StoreParams store_params;
|
||||
store_params.path = test_file.c_str();
|
||||
store_params.model = &model;
|
||||
store_params.config = &config;
|
||||
store_params.plate_data_list.push_back(plate);
|
||||
store_params.strategy = SaveStrategy::Zip64 | SaveStrategy::Silence;
|
||||
REQUIRE(store_bbs_3mf(store_params));
|
||||
|
||||
Model dst_model;
|
||||
DynamicPrintConfig dst_config;
|
||||
ConfigSubstitutionContext ctxt{ ForwardCompatibilitySubstitutionRule::Enable };
|
||||
PlateDataPtrs dst_plates;
|
||||
std::vector<Preset*> project_presets;
|
||||
bool is_bbl_3mf = false, is_orca_3mf = false;
|
||||
Semver file_version;
|
||||
bool loaded = load_bbs_3mf(test_file.c_str(), &dst_config, &ctxt, &dst_model, &dst_plates,
|
||||
&project_presets, &is_bbl_3mf, &is_orca_3mf, &file_version, nullptr,
|
||||
LoadStrategy::LoadModel | LoadStrategy::LoadConfig);
|
||||
boost::filesystem::remove(test_file);
|
||||
|
||||
THEN("the <nozzle> tags round-trip into the loaded plate's nozzles_info") {
|
||||
REQUIRE(loaded);
|
||||
REQUIRE(dst_plates.size() >= 1);
|
||||
PlateData* rt = dst_plates.front();
|
||||
|
||||
REQUIRE(rt->nozzles_info.size() == 2);
|
||||
// reader stores extruder_id 0-based (tag is 1-based), diameter/volume_type preserved.
|
||||
std::sort(rt->nozzles_info.begin(), rt->nozzles_info.end());
|
||||
REQUIRE(rt->nozzles_info[0].group_id == 0);
|
||||
REQUIRE(rt->nozzles_info[0].extruder_id == 0);
|
||||
REQUIRE(rt->nozzles_info[0].diameter == "0.4");
|
||||
REQUIRE(rt->nozzles_info[0].volume_type == NozzleVolumeType::nvtStandard);
|
||||
REQUIRE(rt->nozzles_info[1].group_id == 1);
|
||||
REQUIRE(rt->nozzles_info[1].extruder_id == 1);
|
||||
REQUIRE(rt->nozzles_info[1].volume_type == NozzleVolumeType::nvtHighFlow);
|
||||
|
||||
// A static (non-selector) result must persist enable_filament_dynamic_map = false.
|
||||
auto* dyn = rt->config.option<ConfigOptionBool>("enable_filament_dynamic_map");
|
||||
const bool persisted_true = (dyn != nullptr && dyn->value);
|
||||
REQUIRE_FALSE(persisted_true);
|
||||
}
|
||||
|
||||
release_PlateData_list(dst_plates);
|
||||
}
|
||||
delete plate;
|
||||
boost::filesystem::remove_all(backup_dir);
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("2D convex hull of sinking object", "[3mf][.]") {
|
||||
GIVEN("model") {
|
||||
// load a model
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <catch2/catch_all.hpp>
|
||||
|
||||
#include "libslic3r/Arachne/WallToolPaths.hpp"
|
||||
#include "libslic3r/Arachne/SkeletalTrapezoidation.hpp"
|
||||
#include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
|
||||
#include "libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.hpp"
|
||||
#include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
|
||||
@@ -265,3 +266,46 @@ TEST_CASE("Arachne widening keeps two beads in transition band (#14376)", "[Arac
|
||||
for (const coord_t w : beading.bead_widths)
|
||||
CHECK(w <= inner_width);
|
||||
}
|
||||
|
||||
namespace {
|
||||
// Exposes the protected static interpolate() for a focused unit test.
|
||||
struct InterpolateProbe : SkeletalTrapezoidation {
|
||||
using SkeletalTrapezoidation::interpolate;
|
||||
};
|
||||
} // anonymous namespace
|
||||
|
||||
// interpolate() indexes the merged beading with an index derived from `left`. The merged beading
|
||||
// follows the thicker of left/right, so when the thicker side has fewer insets the index runs past
|
||||
// its end.
|
||||
TEST_CASE("Beading interpolation tolerates a thicker side with fewer insets", "[Arachne][Regression]") {
|
||||
using Beading = BeadingStrategy::Beading;
|
||||
|
||||
// Thicker side (right) has fewer insets, so the merged beading holds only 2 toolpath locations.
|
||||
const coord_t w = scaled<coord_t>(0.42);
|
||||
Beading left;
|
||||
left.total_thickness = scaled<coord_t>(1.0);
|
||||
left.bead_widths = { w, w, w, w };
|
||||
left.toolpath_locations = { scaled<coord_t>(0.1), scaled<coord_t>(0.3), scaled<coord_t>(0.5), scaled<coord_t>(0.7) };
|
||||
left.left_over = 0;
|
||||
|
||||
Beading right;
|
||||
right.total_thickness = scaled<coord_t>(2.0);
|
||||
right.bead_widths = { w, w };
|
||||
right.toolpath_locations = { scaled<coord_t>(0.1), scaled<coord_t>(0.3) };
|
||||
right.left_over = 0;
|
||||
|
||||
// Just past left's location [2] (0.5), so the derived index is 2, past the end of the 2-inset merged beading.
|
||||
const coord_t switching_radius = scaled<coord_t>(0.6);
|
||||
|
||||
Beading result;
|
||||
REQUIRE_NOTHROW(result = InterpolateProbe::interpolate(left, 0.5, right, switching_radius));
|
||||
|
||||
// With the guard the adjustment is skipped, so the result is the plain interpolation.
|
||||
const Beading expected = InterpolateProbe::interpolate(left, 0.5, right);
|
||||
REQUIRE(result.toolpath_locations.size() == expected.toolpath_locations.size());
|
||||
REQUIRE(result.bead_widths.size() == expected.bead_widths.size());
|
||||
for (size_t i = 0; i < expected.toolpath_locations.size(); ++i) {
|
||||
CHECK(result.toolpath_locations[i] == expected.toolpath_locations[i]);
|
||||
CHECK(result.bead_widths[i] == expected.bead_widths[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -401,3 +401,247 @@ SCENARIO("update_diff_values_to_child_config tolerates legacy machine-limit vect
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
TEST_CASE("H2C/A2L-era multi-nozzle and pre-heat config keys exist", "[config]") {
|
||||
// Foundation keys backing H2C 6-nozzle cluster grouping, the pre-heat/pre-cool time
|
||||
// model, and wipe-tower nozzle-change handling. Defaults must keep existing
|
||||
// single-nozzle printers behaving identically.
|
||||
Slic3r::DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
|
||||
|
||||
// Printer / per-extruder options
|
||||
REQUIRE(config.option<ConfigOptionIntsNullable>("extruder_max_nozzle_count") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionIntsNullable>("extruder_max_nozzle_count")->values == std::vector<int>{1});
|
||||
REQUIRE(config.option<ConfigOptionBool>("enable_pre_heating") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionBool>("enable_pre_heating")->value == false);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("hotend_cooling_rate") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("hotend_heating_rate") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloat>("machine_hotend_change_time") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloat>("machine_prepare_compensation_time") != nullptr);
|
||||
|
||||
// Filament pre-cooling / ramming / nozzle-change (nc) options
|
||||
REQUIRE(config.option<ConfigOptionIntsNullable>("filament_pre_cooling_temperature") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionIntsNullable>("filament_pre_cooling_temperature_nc") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_preheat_temperature_delta") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_retract_length_nc") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloats>("filament_change_length_nc") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloats>("filament_prime_volume_nc") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_ramming_travel_time") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_ramming_travel_time_nc") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_ramming_volumetric_speed") != nullptr);
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_ramming_volumetric_speed_nc") != nullptr);
|
||||
|
||||
// Spot-check defaults that must not alter existing behavior.
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_retract_length_nc")->values == std::vector<double>{10.});
|
||||
REQUIRE(config.option<ConfigOptionFloats>("filament_prime_volume_nc")->values == std::vector<double>{60.});
|
||||
REQUIRE(config.option<ConfigOptionIntsNullable>("filament_pre_cooling_temperature_nc")->values == std::vector<int>{0});
|
||||
REQUIRE(config.option<ConfigOptionFloatsNullable>("filament_ramming_volumetric_speed")->values == std::vector<double>{-1});
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index with stride=1 copies values correctly", "[Config][set_to_index]") {
|
||||
GIVEN("A destination vector and a source vector with 3 values") {
|
||||
Slic3r::ConfigOptionFloats dest({0.0});
|
||||
Slic3r::ConfigOptionFloats src({10.0, 20.0, 30.0});
|
||||
std::vector<int> variant_index = {0, 1, 2};
|
||||
int stride = 1;
|
||||
|
||||
WHEN("set_to_index is called with stride=1") {
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("The destination contains the source values") {
|
||||
REQUIRE(dest.values.size() == 3);
|
||||
REQUIRE(dest.values[0] == 10.0);
|
||||
REQUIRE(dest.values[1] == 20.0);
|
||||
REQUIRE(dest.values[2] == 30.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GIVEN("A destination vector and a source vector with subset mapping") {
|
||||
Slic3r::ConfigOptionFloats dest({0.0});
|
||||
Slic3r::ConfigOptionFloats src({100.0, 200.0, 300.0});
|
||||
std::vector<int> variant_index = {1, 2};
|
||||
int stride = 1;
|
||||
|
||||
WHEN("set_to_index maps only indices 1 and 2") {
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("Only the mapped values are copied, default fills the others") {
|
||||
REQUIRE(dest.values.size() == 2);
|
||||
REQUIRE(dest.values[0] == 200.0);
|
||||
REQUIRE(dest.values[1] == 300.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index with stride=2 copies grouped values correctly", "[Config][set_to_index]") {
|
||||
GIVEN("A destination vector and a source vector with stride=2 (e.g., nozzle groups)") {
|
||||
// Source has 4 groups of 2 values each: (10,11), (20,21), (30,31), (40,41)
|
||||
Slic3r::ConfigOptionFloats dest({0.0});
|
||||
Slic3r::ConfigOptionFloats src({10.0, 11.0, 20.0, 21.0, 30.0, 31.0, 40.0, 41.0});
|
||||
int stride = 2;
|
||||
|
||||
WHEN("set_to_index maps groups 0, 1, 3") {
|
||||
std::vector<int> variant_index = {0, 1, 3};
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("The destination has 3 groups (6 values) mapped correctly") {
|
||||
REQUIRE(dest.values.size() == 6);
|
||||
// Group 0: (10, 11)
|
||||
REQUIRE(dest.values[0] == 10.0);
|
||||
REQUIRE(dest.values[1] == 11.0);
|
||||
// Group 1: (20, 21)
|
||||
REQUIRE(dest.values[2] == 20.0);
|
||||
REQUIRE(dest.values[3] == 21.0);
|
||||
// Group 3: (40, 41)
|
||||
REQUIRE(dest.values[4] == 40.0);
|
||||
REQUIRE(dest.values[5] == 41.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GIVEN("A destination and a single-group source") {
|
||||
Slic3r::ConfigOptionFloats dest({0.0});
|
||||
// Source has 1 group of 2 values
|
||||
Slic3r::ConfigOptionFloats src({50.0, 60.0});
|
||||
int stride = 2;
|
||||
|
||||
WHEN("set_to_index maps group 0 from a single-group source") {
|
||||
std::vector<int> variant_index = {0};
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("The destination contains the single group correctly") {
|
||||
REQUIRE(dest.values.size() == 2);
|
||||
REQUIRE(dest.values[0] == 50.0);
|
||||
REQUIRE(dest.values[1] == 60.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index handles empty dest_index", "[Config][set_to_index]") {
|
||||
GIVEN("A destination and source with stride=2") {
|
||||
Slic3r::ConfigOptionFloats dest({0.0});
|
||||
Slic3r::ConfigOptionFloats src({10.0, 11.0, 20.0, 21.0});
|
||||
std::vector<int> variant_index = {};
|
||||
int stride = 2;
|
||||
|
||||
WHEN("set_to_index is called with an empty index vector") {
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("The destination is resized to 0") {
|
||||
REQUIRE(dest.values.size() == 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index handles nil values in source", "[Config][set_to_index]") {
|
||||
GIVEN("A source with a nil group (stride=2)") {
|
||||
Slic3r::ConfigOptionFloatsNullable dest({0.0});
|
||||
Slic3r::ConfigOptionFloatsNullable src({10.0, 11.0,
|
||||
Slic3r::ConfigOptionFloatsNullable::nil_value(), Slic3r::ConfigOptionFloatsNullable::nil_value(),
|
||||
30.0, 31.0});
|
||||
int stride = 2;
|
||||
|
||||
WHEN("set_to_index maps all groups including the nil one") {
|
||||
std::vector<int> variant_index = {0, 1, 2};
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("Non-nil groups are copied and the nil group keeps the default") {
|
||||
REQUIRE(dest.values.size() == 6);
|
||||
// Group 0: (10, 11) — copied
|
||||
REQUIRE(dest.values[0] == 10.0);
|
||||
REQUIRE(dest.values[1] == 11.0);
|
||||
// Group 1: nil — keeps default (the front value = 10.0)
|
||||
REQUIRE(dest.values[2] == 10.0);
|
||||
REQUIRE(dest.values[3] == 10.0);
|
||||
// Group 2: (30, 31) — copied
|
||||
REQUIRE(dest.values[4] == 30.0);
|
||||
REQUIRE(dest.values[5] == 31.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index handles out-of-bounds dest_index", "[Config][set_to_index]") {
|
||||
GIVEN("A source with only 2 groups (4 values) but dest_index references group 3") {
|
||||
Slic3r::ConfigOptionFloats dest({0.0});
|
||||
Slic3r::ConfigOptionFloats src({10.0, 11.0, 20.0, 21.0}); // 2 groups of stride 2
|
||||
int stride = 2;
|
||||
|
||||
WHEN("set_to_index maps group 3 which is out of bounds") {
|
||||
std::vector<int> variant_index = {0, 3}; // group 3 is out of range
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("Group 0 is copied, group 3 falls back to default without crashing") {
|
||||
REQUIRE(dest.values.size() == 4);
|
||||
// Group 0: (10, 11) — copied
|
||||
REQUIRE(dest.values[0] == 10.0);
|
||||
REQUIRE(dest.values[1] == 11.0);
|
||||
// Group 3: out of bounds — keeps default (10.0 = src.values.front())
|
||||
REQUIRE(dest.values[2] == 10.0);
|
||||
REQUIRE(dest.values[3] == 10.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index handles negative dest_index values", "[Config][set_to_index]") {
|
||||
GIVEN("A destination and source with a negative entry in dest_index") {
|
||||
// The dest is initially empty, so resize fills all slots with src.values.front().
|
||||
Slic3r::ConfigOptionFloats dest;
|
||||
Slic3r::ConfigOptionFloats src({100.0, 101.0, 200.0, 201.0});
|
||||
int stride = 2;
|
||||
|
||||
WHEN("set_to_index maps group 0 and a negative index") {
|
||||
std::vector<int> variant_index = {-1, 0};
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("The negative index is skipped, the valid group is copied") {
|
||||
REQUIRE(dest.values.size() == 4);
|
||||
// Position 0 (variant_index[0] = -1): skipped, keeps default fill
|
||||
// from resize (src.values.front() = 100.0, applied to all new elements)
|
||||
REQUIRE(dest.values[0] == 100.0);
|
||||
REQUIRE(dest.values[1] == 100.0);
|
||||
// Position 1 (variant_index[1] = 0): copied from group 0 of src
|
||||
REQUIRE(dest.values[2] == 100.0);
|
||||
REQUIRE(dest.values[3] == 101.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index handles single-element groups with stride=1", "[Config][set_to_index]") {
|
||||
GIVEN("A destination re-mapping one variant index with a stride=1 source") {
|
||||
// Simulates the PrintObject.cpp code path: stride=1, variant_index={1}
|
||||
Slic3r::ConfigOptionFloats dest({99.0, 99.0, 99.0, 99.0}); // pre-sized for 4 extruders
|
||||
Slic3r::ConfigOptionFloats src({0.5, 0.6, 0.7, 0.8}); // 4 extruder values
|
||||
std::vector<int> variant_index = {1}; // only extruder 1 is active
|
||||
int stride = 1;
|
||||
|
||||
WHEN("set_to_index is called") {
|
||||
dest.set_to_index(&src, variant_index, stride);
|
||||
|
||||
THEN("Only the mapped value is copied, rest are defaulted") {
|
||||
REQUIRE(dest.values.size() == 1);
|
||||
REQUIRE(dest.values[0] == 0.6);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SCENARIO("ConfigOptionVector::set_to_index throws on incompatible type", "[Config][set_to_index]") {
|
||||
GIVEN("A Floats destination and an Ints source") {
|
||||
Slic3r::ConfigOptionFloats dest({0.0});
|
||||
Slic3r::ConfigOptionInts src({1, 2, 3});
|
||||
std::vector<int> variant_index = {0};
|
||||
int stride = 1;
|
||||
|
||||
WHEN("set_to_index is called with mismatched types") {
|
||||
THEN("A ConfigurationError is thrown") {
|
||||
REQUIRE_THROWS_AS(dest.set_to_index(&src, variant_index, stride), Slic3r::ConfigurationError);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
336
tests/libslic3r/test_config_variant_expansion.cpp
Normal file
336
tests/libslic3r/test_config_variant_expansion.cpp
Normal file
@@ -0,0 +1,336 @@
|
||||
#include <catch2/catch_all.hpp>
|
||||
|
||||
#include "libslic3r/PrintConfig.hpp"
|
||||
|
||||
using namespace Slic3r;
|
||||
|
||||
namespace {
|
||||
|
||||
// A 2-extruder printer whose second extruder holds both a Standard and a High Flow nozzle
|
||||
// (nozzle_volume_type Hybrid), described by extruder_nozzle_stats. The variant lists carry one
|
||||
// column per (extruder x volume type) as composed from the presets.
|
||||
DynamicPrintConfig make_hybrid_printer_config()
|
||||
{
|
||||
DynamicPrintConfig config;
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "Standard#3|High Flow#2"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
return config;
|
||||
}
|
||||
|
||||
void add_print_variant_columns(DynamicPrintConfig &config)
|
||||
{
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("outer_wall_speed", true)->values = {30., 200., 50., 500.};
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
TEST_CASE("apply_override fills nil entries from the 0-based default index", "[Config]")
|
||||
{
|
||||
ConfigOptionFloats machine({10., 20., 30.});
|
||||
ConfigOptionFloatsNullable filament;
|
||||
filament.values = {ConfigOptionFloatsNullable::nil_value(), 42.};
|
||||
|
||||
SECTION("a nil entry picks the slot addressed by its 0-based index") {
|
||||
std::vector<int> slot_index{2, 0};
|
||||
ConfigOptionFloats resolved(machine);
|
||||
REQUIRE(resolved.apply_override(&filament, slot_index));
|
||||
REQUIRE(resolved.values == std::vector<double>({30., 42.}));
|
||||
}
|
||||
|
||||
SECTION("an index past the machine slots falls back to the first slot") {
|
||||
std::vector<int> slot_index{5, 0};
|
||||
ConfigOptionFloats resolved(machine);
|
||||
REQUIRE(resolved.apply_override(&filament, slot_index));
|
||||
REQUIRE(resolved.values == std::vector<double>({10., 42.}));
|
||||
}
|
||||
|
||||
SECTION("a negative index (unresolved slot) falls back to the first slot") {
|
||||
std::vector<int> slot_index{-1, 0};
|
||||
ConfigOptionFloats resolved(machine);
|
||||
REQUIRE(resolved.apply_override(&filament, slot_index));
|
||||
REQUIRE(resolved.values == std::vector<double>({10., 42.}));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("get_config_index_base resolves (volume type, extruder type, id) to a slot", "[Config]")
|
||||
{
|
||||
const std::vector<std::string> variant_list = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
const std::vector<int> variant_ids = {1, 1, 2, 2};
|
||||
|
||||
SECTION("a matching (variant, id) pair yields its slot") {
|
||||
REQUIRE(get_config_index_base(nvtStandard, etDirectDrive, 1, variant_list, variant_ids) == 0);
|
||||
REQUIRE(get_config_index_base(nvtHighFlow, etDirectDrive, 1, variant_list, variant_ids) == 1);
|
||||
REQUIRE(get_config_index_base(nvtStandard, etDirectDrive, 2, variant_list, variant_ids) == 2);
|
||||
REQUIRE(get_config_index_base(nvtHighFlow, etDirectDrive, 2, variant_list, variant_ids) == 3);
|
||||
}
|
||||
|
||||
SECTION("no matching column falls back to slot 0") {
|
||||
REQUIRE(get_config_index_base(nvtStandard, etDirectDrive, 3, variant_list, variant_ids) == 0);
|
||||
REQUIRE(get_config_index_base(nvtStandard, etBowden, 1, variant_list, variant_ids) == 0);
|
||||
}
|
||||
|
||||
SECTION("Hybrid is not a preset variant string and falls back to slot 0") {
|
||||
REQUIRE(get_config_index_base(nvtHybrid, etDirectDrive, 2, variant_list, variant_ids) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("get_extruder_nozzle_volume_count reads the per-extruder volume-type layout", "[Config]")
|
||||
{
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
|
||||
SECTION("absent stats fall back to one slot per extruder") {
|
||||
DynamicPrintConfig config;
|
||||
REQUIRE(config.get_extruder_nozzle_volume_count(2, nozzle_volume_types) == 2);
|
||||
REQUIRE(nozzle_volume_types.size() == 2);
|
||||
REQUIRE(nozzle_volume_types[0].empty());
|
||||
REQUIRE(nozzle_volume_types[1].empty());
|
||||
}
|
||||
|
||||
SECTION("stats sized differently from the extruder count are ignored") {
|
||||
DynamicPrintConfig config;
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1"};
|
||||
REQUIRE(config.get_extruder_nozzle_volume_count(2, nozzle_volume_types) == 2);
|
||||
REQUIRE(nozzle_volume_types[0].empty());
|
||||
REQUIRE(nozzle_volume_types[1].empty());
|
||||
}
|
||||
|
||||
SECTION("single volume type per extruder counts one slot each") {
|
||||
DynamicPrintConfig config;
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "High Flow#1"};
|
||||
REQUIRE(config.get_extruder_nozzle_volume_count(2, nozzle_volume_types) == 2);
|
||||
REQUIRE(nozzle_volume_types[0] == std::vector<NozzleVolumeType>{nvtStandard});
|
||||
REQUIRE(nozzle_volume_types[1] == std::vector<NozzleVolumeType>{nvtHighFlow});
|
||||
}
|
||||
|
||||
SECTION("a mixed-nozzle extruder contributes one slot per volume type, ascending enum order") {
|
||||
DynamicPrintConfig config;
|
||||
// list High Flow first in the token string: parsing must still order Standard before High Flow
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#3", "High Flow#3|Standard#3"};
|
||||
REQUIRE(config.get_extruder_nozzle_volume_count(2, nozzle_volume_types) == 3);
|
||||
REQUIRE(nozzle_volume_types[0] == std::vector<NozzleVolumeType>{nvtStandard});
|
||||
REQUIRE(nozzle_volume_types[1] == std::vector<NozzleVolumeType>({nvtStandard, nvtHighFlow}));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("update_values_to_printer_extruders expands one slot per (extruder x volume type)", "[Config]")
|
||||
{
|
||||
SECTION("Hybrid extruder yields three slots, extruder-ascending then volume-ascending") {
|
||||
DynamicPrintConfig config = make_hybrid_printer_config();
|
||||
add_print_variant_columns(config);
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
REQUIRE(count == 3);
|
||||
|
||||
std::vector<int> variant_index = config.update_values_to_printer_extruders(config, extruder_count, count, nozzle_volume_types,
|
||||
print_options_with_variant, "print_extruder_id", "print_extruder_variant");
|
||||
|
||||
REQUIRE(variant_index == std::vector<int>({0, 2, 3}));
|
||||
REQUIRE(config.option<ConfigOptionFloats>("outer_wall_speed")->values == std::vector<double>({30., 50., 500.}));
|
||||
REQUIRE(config.option<ConfigOptionInts>("print_extruder_id")->values == std::vector<int>({1, 2, 2}));
|
||||
REQUIRE(config.option<ConfigOptionStrings>("print_extruder_variant")->values ==
|
||||
std::vector<std::string>({"Direct Drive Standard", "Direct Drive Standard", "Direct Drive High Flow"}));
|
||||
}
|
||||
|
||||
SECTION("stride-2 options keep (normal, silent) pairs together per slot") {
|
||||
DynamicPrintConfig config = make_hybrid_printer_config();
|
||||
config.option<ConfigOptionInts>("printer_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("printer_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("machine_max_speed_x", true)->values = {100., 50., 110., 55., 120., 60., 130., 65.};
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
|
||||
std::vector<int> variant_index = config.update_values_to_printer_extruders(config, extruder_count, count, nozzle_volume_types,
|
||||
printer_options_with_variant_2, "printer_extruder_id", "printer_extruder_variant", 2);
|
||||
|
||||
REQUIRE(variant_index == std::vector<int>({0, 2, 3}));
|
||||
REQUIRE(config.option<ConfigOptionFloats>("machine_max_speed_x")->values ==
|
||||
std::vector<double>({100., 50., 120., 60., 130., 65.}));
|
||||
}
|
||||
|
||||
SECTION("single-slot expansion on a Hybrid extruder resolves via the filament volume type") {
|
||||
DynamicPrintConfig printer_config = make_hybrid_printer_config();
|
||||
|
||||
DynamicPrintConfig filament_config;
|
||||
filament_config.option<ConfigOptionStrings>("filament_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
filament_config.option<ConfigOptionFloats>("filament_max_volumetric_speed", true)->values = {12., 20.};
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = printer_config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
|
||||
SECTION("default filament volume type selects the Standard column") {
|
||||
std::vector<int> variant_index = filament_config.update_values_to_printer_extruders(printer_config, extruder_count, count,
|
||||
nozzle_volume_types, filament_options_with_variant, "", "filament_extruder_variant", 1, 2);
|
||||
REQUIRE(variant_index == std::vector<int>({0}));
|
||||
REQUIRE(filament_config.option<ConfigOptionFloats>("filament_max_volumetric_speed")->values == std::vector<double>({12.}));
|
||||
}
|
||||
|
||||
SECTION("a High Flow filament volume type selects the High Flow column") {
|
||||
std::vector<int> variant_index = filament_config.update_values_to_printer_extruders(printer_config, extruder_count, count,
|
||||
nozzle_volume_types, filament_options_with_variant, "", "filament_extruder_variant", 1, 2, nvtHighFlow);
|
||||
REQUIRE(variant_index == std::vector<int>({1}));
|
||||
REQUIRE(filament_config.option<ConfigOptionFloats>("filament_max_volumetric_speed")->values == std::vector<double>({20.}));
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("an extruder without per-type stats does not overrun the slot table when another is Hybrid") {
|
||||
DynamicPrintConfig config;
|
||||
// e0 carries no per-type stats (empty entry), so the summed volume-type count (2) does
|
||||
// not exceed the extruder count even though the Hybrid e1 emits one slot per volume type.
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"", "Standard#3|High Flow#3"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
add_print_variant_columns(config);
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
REQUIRE(count == 2);
|
||||
REQUIRE(nozzle_volume_types[0].empty());
|
||||
|
||||
std::vector<int> variant_index = config.update_values_to_printer_extruders(config, extruder_count, count, nozzle_volume_types,
|
||||
print_options_with_variant, "print_extruder_id", "print_extruder_variant");
|
||||
|
||||
// e0 resolves by its configured type; the Hybrid e1 emits one slot per stats volume type
|
||||
REQUIRE(variant_index == std::vector<int>({0, 2, 3}));
|
||||
REQUIRE(config.option<ConfigOptionFloats>("outer_wall_speed")->values == std::vector<double>({30., 50., 500.}));
|
||||
}
|
||||
|
||||
SECTION("without Hybrid or extra slots the expansion matches the per-extruder resolution") {
|
||||
DynamicPrintConfig config;
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHighFlow};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
add_print_variant_columns(config);
|
||||
|
||||
// compute what the per-extruder loop resolves directly, before the arrays are rewritten
|
||||
std::vector<int> expected_index;
|
||||
for (int e_index = 0; e_index < 2; e_index++)
|
||||
expected_index.push_back(config.get_index_for_extruder(e_index + 1, "print_extruder_id", etDirectDrive,
|
||||
e_index == 0 ? nvtStandard : nvtHighFlow, "print_extruder_variant"));
|
||||
REQUIRE(expected_index == std::vector<int>({0, 3}));
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
REQUIRE(count == 2);
|
||||
|
||||
std::vector<int> variant_index = config.update_values_to_printer_extruders(config, extruder_count, count, nozzle_volume_types,
|
||||
print_options_with_variant, "print_extruder_id", "print_extruder_variant");
|
||||
|
||||
REQUIRE(variant_index == expected_index);
|
||||
REQUIRE(config.option<ConfigOptionFloats>("outer_wall_speed")->values == std::vector<double>({30., 500.}));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("update_values_to_printer_extruders_for_multiple_filaments resolves per-filament slots", "[Config]")
|
||||
{
|
||||
auto make_filament_arrays = [](DynamicPrintConfig &config) {
|
||||
config.option<ConfigOptionInts>("filament_self_index", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("filament_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("filament_max_volumetric_speed", true)->values = {12., 20., 13., 21.};
|
||||
};
|
||||
|
||||
std::set<std::string> filament_keys = filament_options_with_variant;
|
||||
filament_keys.insert("filament_self_index");
|
||||
|
||||
SECTION("filament_volume_map picks the concrete volume type on a Hybrid extruder") {
|
||||
DynamicPrintConfig config = make_hybrid_printer_config();
|
||||
make_filament_arrays(config);
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {2, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {nvtStandard, nvtHighFlow};
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
|
||||
config.update_values_to_printer_extruders_for_multiple_filaments(config, extruder_count, count, filament_keys,
|
||||
"filament_self_index", "filament_extruder_variant");
|
||||
|
||||
REQUIRE(config.option<ConfigOptionFloats>("filament_max_volumetric_speed")->values == std::vector<double>({12., 21.}));
|
||||
REQUIRE(config.option<ConfigOptionStrings>("filament_extruder_variant")->values ==
|
||||
std::vector<std::string>({"Direct Drive Standard", "Direct Drive High Flow"}));
|
||||
REQUIRE(config.option<ConfigOptionInts>("filament_self_index")->values == std::vector<int>({1, 2}));
|
||||
}
|
||||
|
||||
SECTION("a volume map not sized to the filament count is ignored") {
|
||||
DynamicPrintConfig config = make_hybrid_printer_config();
|
||||
make_filament_arrays(config);
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {2, 2};
|
||||
// the registered default is a single-element vector; it must not override slot resolution
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {nvtStandard};
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
|
||||
config.update_values_to_printer_extruders_for_multiple_filaments(config, extruder_count, count, filament_keys,
|
||||
"filament_self_index", "filament_extruder_variant");
|
||||
|
||||
// Hybrid resolves as Standard when no usable per-filament map exists
|
||||
REQUIRE(config.option<ConfigOptionFloats>("filament_max_volumetric_speed")->values == std::vector<double>({12., 13.}));
|
||||
REQUIRE(config.option<ConfigOptionInts>("filament_self_index")->values == std::vector<int>({1, 2}));
|
||||
}
|
||||
|
||||
SECTION("a single-filament explicit assignment on a Hybrid extruder is honored") {
|
||||
DynamicPrintConfig config = make_hybrid_printer_config();
|
||||
config.option<ConfigOptionInts>("filament_self_index", true)->values = {1, 1};
|
||||
config.option<ConfigOptionStrings>("filament_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("filament_max_volumetric_speed", true)->values = {12., 20.};
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {2};
|
||||
// sized to the (single) filament count: the producers guarantee sizing, so a
|
||||
// single-filament map is as trustworthy as any other and the explicit High Flow
|
||||
// request must win over the Hybrid->Standard fallback
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {nvtHighFlow};
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
|
||||
config.update_values_to_printer_extruders_for_multiple_filaments(config, extruder_count, count, filament_keys,
|
||||
"filament_self_index", "filament_extruder_variant");
|
||||
|
||||
REQUIRE(config.option<ConfigOptionFloats>("filament_max_volumetric_speed")->values == std::vector<double>({20.}));
|
||||
REQUIRE(config.option<ConfigOptionInts>("filament_self_index")->values == std::vector<int>({1}));
|
||||
}
|
||||
|
||||
SECTION("without Hybrid or extra slots the volume map is not consulted") {
|
||||
DynamicPrintConfig config;
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHighFlow};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
make_filament_arrays(config);
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2};
|
||||
// sized to the filament count, but inert because no extruder exposes multiple volume types
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {nvtHighFlow, nvtStandard};
|
||||
|
||||
std::vector<std::vector<NozzleVolumeType>> nozzle_volume_types;
|
||||
int extruder_count = 2;
|
||||
int count = config.get_extruder_nozzle_volume_count(extruder_count, nozzle_volume_types);
|
||||
REQUIRE(count == 2);
|
||||
|
||||
config.update_values_to_printer_extruders_for_multiple_filaments(config, extruder_count, count, filament_keys,
|
||||
"filament_self_index", "filament_extruder_variant");
|
||||
|
||||
// filament 1 keeps its extruder's Standard column, filament 2 its extruder's High Flow column
|
||||
REQUIRE(config.option<ConfigOptionFloats>("filament_max_volumetric_speed")->values == std::vector<double>({12., 21.}));
|
||||
REQUIRE(config.option<ConfigOptionInts>("filament_self_index")->values == std::vector<int>({1, 2}));
|
||||
}
|
||||
}
|
||||
31
tests/libslic3r/test_nozzle_volume_type.cpp
Normal file
31
tests/libslic3r/test_nozzle_volume_type.cpp
Normal file
@@ -0,0 +1,31 @@
|
||||
#include <catch2/catch_all.hpp>
|
||||
|
||||
#include "libslic3r/PrintConfig.hpp"
|
||||
|
||||
using namespace Slic3r;
|
||||
|
||||
TEST_CASE("convert_to_nvt_type maps extruder variant strings to nozzle volume types", "[Config]")
|
||||
{
|
||||
SECTION("Direct Drive variants") {
|
||||
REQUIRE(convert_to_nvt_type("Direct Drive Standard") == nvtStandard);
|
||||
REQUIRE(convert_to_nvt_type("Direct Drive High Flow") == nvtHighFlow);
|
||||
REQUIRE(convert_to_nvt_type("Direct Drive TPU High Flow") == nvtTPUHighFlow);
|
||||
}
|
||||
|
||||
SECTION("Bowden variants") {
|
||||
REQUIRE(convert_to_nvt_type("Bowden Standard") == nvtStandard);
|
||||
REQUIRE(convert_to_nvt_type("Bowden High Flow") == nvtHighFlow);
|
||||
}
|
||||
|
||||
SECTION("Unparsable strings fall back to hybrid") {
|
||||
REQUIRE(convert_to_nvt_type("Unknown Extruder") == nvtHybrid);
|
||||
REQUIRE(convert_to_nvt_type("") == nvtHybrid);
|
||||
REQUIRE(convert_to_nvt_type("High Flow") == nvtHybrid);
|
||||
REQUIRE(convert_to_nvt_type("Direct Drive") == nvtHybrid);
|
||||
}
|
||||
|
||||
SECTION("Whitespace around the volume-type remainder is trimmed") {
|
||||
REQUIRE(convert_to_nvt_type("Direct Drive High Flow ") == nvtHighFlow);
|
||||
REQUIRE(convert_to_nvt_type(" Bowden Standard") == nvtStandard);
|
||||
}
|
||||
}
|
||||
@@ -52,6 +52,11 @@ SCENARIO("Placeholder parser scripting", "[PlaceholderParser]") {
|
||||
SECTION("math: round(-13.4)") { REQUIRE(parser.process("{round(-13.4)}") == "-13"); }
|
||||
SECTION("math: round(13.6)") { REQUIRE(parser.process("{round(13.6)}") == "14"); }
|
||||
SECTION("math: round(-13.6)") { REQUIRE(parser.process("{round(-13.6)}") == "-14"); }
|
||||
SECTION("math: round(13.5)") { REQUIRE(parser.process("{round(13.5)}") == "14"); }
|
||||
SECTION("math: floor(13.9)") { REQUIRE(parser.process("{floor(13.9)}") == "13"); }
|
||||
SECTION("math: floor(-13.1)") { REQUIRE(parser.process("{floor(-13.1)}") == "-14"); }
|
||||
SECTION("math: ceil(13.1)") { REQUIRE(parser.process("{ceil(13.1)}") == "14"); }
|
||||
SECTION("math: ceil(-13.9)") { REQUIRE(parser.process("{ceil(-13.9)}") == "-13"); }
|
||||
SECTION("math: digits(5, 15)") { REQUIRE(parser.process("{digits(5, 15)}") == " 5"); }
|
||||
SECTION("math: digits(5., 15)") { REQUIRE(parser.process("{digits(5., 15)}") == " 5"); }
|
||||
SECTION("math: zdigits(5, 15)") { REQUIRE(parser.process("{zdigits(5, 15)}") == "000000000000005"); }
|
||||
@@ -65,6 +70,8 @@ SCENARIO("Placeholder parser scripting", "[PlaceholderParser]") {
|
||||
SECTION("math: interpolate_table(13.84375892476, (0, 0), (20, 20))") { REQUIRE(std::stod(parser.process("{interpolate_table(13.84375892476, (0, 0), (20, 20))}")) == Catch::Approx(13.84375892476)); }
|
||||
SECTION("math: interpolate_table(13, (0, 0), (20, 20), (30, 20))") { REQUIRE(std::stod(parser.process("{interpolate_table(13, (0, 0), (20, 20), (30, 20))}")) == Catch::Approx(13.)); }
|
||||
SECTION("math: interpolate_table(25, (0, 0), (20, 20), (30, 20))") { REQUIRE(std::stod(parser.process("{interpolate_table(25, (0, 0), (20, 20), (30, 20))}")) == Catch::Approx(20.)); }
|
||||
// Only the grammar's built-in functions are callable; any other name is an undefined variable and throws.
|
||||
SECTION("math: a non-built-in function name throws") { REQUIRE_THROWS(parser.process("{sqrt(16)}")); }
|
||||
|
||||
// regex_replace(subject, /pattern/, replacement): the string-transform primitive.
|
||||
SECTION("regex_replace: strips a file extension") { REQUIRE(parser.process("{regex_replace(\"part.stl\", /\\.[^.]*$/, \"\")}") == "part"); }
|
||||
|
||||
936
tests/libslic3r/test_toolordering_nozzle_group.cpp
Normal file
936
tests/libslic3r/test_toolordering_nozzle_group.cpp
Normal file
@@ -0,0 +1,936 @@
|
||||
#include <catch2/catch_all.hpp>
|
||||
|
||||
#include "libslic3r/FilamentGroupUtils.hpp"
|
||||
#include "libslic3r/MultiNozzleUtils.hpp"
|
||||
#include "libslic3r/PrintConfig.hpp"
|
||||
#include "libslic3r/GCode/ToolOrdering.hpp"
|
||||
#include "libslic3r/Model.hpp"
|
||||
#include "libslic3r/Print.hpp"
|
||||
#include "libslic3r/TriangleMesh.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
|
||||
// H2C/A2L multi-nozzle filament grouping core.
|
||||
//
|
||||
// These tests pin the behaviour of the grouping result type
|
||||
// (Slic3r::MultiNozzleUtils::LayeredNozzleGroupResult) that GCode consumes via
|
||||
// group_result->get_nozzle_id(filament, layer) and
|
||||
// group_result->get_first_nozzle_for_filament(filament)->group_id.
|
||||
//
|
||||
// The central requirement is ZERO behaviour change for existing (single-nozzle)
|
||||
// printers: with extruder_max_nozzle_count == 1 per extruder the result collapses
|
||||
// to the classic filament->extruder grouping (nozzle id == extruder id).
|
||||
|
||||
using namespace Slic3r;
|
||||
using namespace Slic3r::MultiNozzleUtils;
|
||||
|
||||
namespace {
|
||||
// Build a trivial "one logical nozzle per extruder" list, the single-nozzle case
|
||||
// that every current printer profile produces.
|
||||
std::vector<NozzleInfo> single_nozzle_per_extruder(int extruder_count)
|
||||
{
|
||||
std::vector<NozzleInfo> nozzle_list;
|
||||
for (int e = 0; e < extruder_count; ++e) {
|
||||
NozzleInfo n;
|
||||
n.diameter = "0.4";
|
||||
n.volume_type = nvtStandard;
|
||||
n.extruder_id = e;
|
||||
n.group_id = e; // one nozzle per extruder => nozzle id == extruder id
|
||||
nozzle_list.push_back(n);
|
||||
}
|
||||
return nozzle_list;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
TEST_CASE("Multi-nozzle gate predicate mirrors BambuStudio", "[ToolOrdering][H2C]")
|
||||
{
|
||||
// The multi-nozzle gate: std::any_of(extruder_max_nozzle_count > 1).
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
|
||||
auto *opt = config.option<ConfigOptionIntsNullable>("extruder_max_nozzle_count");
|
||||
REQUIRE(opt != nullptr); // extruder_max_nozzle_count must be a real config option
|
||||
|
||||
// extruder_nozzle_stats must be a real config option so printer profiles and
|
||||
// 3mf projects round-trip the per-extruder nozzle inventory (GUI producers wire it later).
|
||||
REQUIRE(config.option<ConfigOptionStrings>("extruder_nozzle_stats") != nullptr);
|
||||
|
||||
auto has_multiple_nozzle = [](const std::vector<int> &values) {
|
||||
return std::any_of(values.begin(), values.end(), [](int v) { return v > 1; });
|
||||
};
|
||||
|
||||
// Default for every existing printer: 1 nozzle per extruder => gate is closed.
|
||||
REQUIRE_FALSE(has_multiple_nozzle(opt->values));
|
||||
|
||||
// Synthetic H2C-like machine: extruder 1 is a 6-nozzle cluster => gate opens.
|
||||
REQUIRE(has_multiple_nozzle(std::vector<int>{1, 6}));
|
||||
}
|
||||
|
||||
TEST_CASE("Single-nozzle grouping: every filament maps to its extruder nozzle", "[ToolOrdering][H2C]")
|
||||
{
|
||||
SECTION("single extruder => all filaments map to nozzle 0")
|
||||
{
|
||||
auto nozzle_list = single_nozzle_per_extruder(1);
|
||||
// 3 filaments, all assigned to the single extruder 0.
|
||||
std::vector<int> filament_nozzle_map = {0, 0, 0};
|
||||
std::vector<unsigned int> used_filaments = {0, 1, 2};
|
||||
|
||||
auto group_opt = LayeredNozzleGroupResult::create(filament_nozzle_map, nozzle_list, used_filaments);
|
||||
REQUIRE(group_opt.has_value());
|
||||
auto &group = *group_opt;
|
||||
|
||||
for (int f = 0; f < 3; ++f) {
|
||||
REQUIRE(group.get_nozzle_id(f) == 0);
|
||||
REQUIRE(group.get_extruder_id(f) == 0);
|
||||
auto first = group.get_first_nozzle_for_filament(f);
|
||||
REQUIRE(first.has_value());
|
||||
REQUIRE(first->group_id == 0);
|
||||
}
|
||||
REQUIRE_FALSE(group.is_support_dynamic_nozzle_map());
|
||||
}
|
||||
|
||||
SECTION("dual extruder => nozzle id equals the classic extruder grouping")
|
||||
{
|
||||
auto nozzle_list = single_nozzle_per_extruder(2);
|
||||
// filament -> extruder map (the map Orca's reorder already computes).
|
||||
std::vector<int> filament_map = {0, 1, 0, 1};
|
||||
std::vector<unsigned int> used_filaments = {0, 1, 2, 3};
|
||||
|
||||
auto group_opt = LayeredNozzleGroupResult::create(filament_map, nozzle_list, used_filaments);
|
||||
REQUIRE(group_opt.has_value());
|
||||
auto &group = *group_opt;
|
||||
|
||||
REQUIRE(group.get_nozzle_id(0) == 0);
|
||||
REQUIRE(group.get_nozzle_id(1) == 1);
|
||||
REQUIRE(group.get_nozzle_id(2) == 0);
|
||||
REQUIRE(group.get_nozzle_id(3) == 1);
|
||||
// With one nozzle per extruder, nozzle id and extruder id agree.
|
||||
for (int f = 0; f < 4; ++f)
|
||||
REQUIRE(group.get_nozzle_id(f) == group.get_extruder_id(f));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("H2C multi-nozzle: filaments get distinct nozzles on the 6-nozzle extruder", "[ToolOrdering][H2C]")
|
||||
{
|
||||
// Synthetic H2C-like config: 2 extruders, extruder_max_nozzle_count = {1, 6},
|
||||
// 4 filaments all assigned to extruder 1 (0-based). Each filament requests a
|
||||
// distinct logical nozzle cluster (as the grouping algorithm would emit), so the
|
||||
// create() overload must resolve them to 4 distinct physical nozzles.
|
||||
std::vector<unsigned int> used_filaments = {0, 1, 2, 3};
|
||||
std::vector<int> filament_map = {1, 1, 1, 1}; // extruder 1
|
||||
std::vector<int> filament_volume_map = {0, 0, 0, 0}; // nvtStandard
|
||||
std::vector<int> filament_nozzle_map = {0, 1, 2, 3}; // distinct clusters
|
||||
|
||||
std::vector<std::map<NozzleVolumeType, int>> nozzle_count(2);
|
||||
nozzle_count[0] = {}; // extruder 0: 1-nozzle (unused here)
|
||||
nozzle_count[1] = {{nvtStandard, 6}}; // extruder 1: 6-nozzle cluster
|
||||
|
||||
auto group_opt = LayeredNozzleGroupResult::create(
|
||||
used_filaments, filament_map, filament_volume_map, filament_nozzle_map, nozzle_count, 0.4f);
|
||||
REQUIRE(group_opt.has_value());
|
||||
auto &group = *group_opt;
|
||||
|
||||
// All four filaments live on extruder 1, on four distinct physical nozzles.
|
||||
std::set<int> distinct_nozzles;
|
||||
for (int f = 0; f < 4; ++f) {
|
||||
REQUIRE(group.get_extruder_id(f) == 1);
|
||||
int nid = group.get_nozzle_id(f);
|
||||
REQUIRE(nid >= 0);
|
||||
distinct_nozzles.insert(nid);
|
||||
}
|
||||
REQUIRE(distinct_nozzles.size() == 4);
|
||||
|
||||
// get_nozzle_id must be stable across layers (no per-layer / selector map here).
|
||||
for (int f = 0; f < 4; ++f) {
|
||||
int base = group.get_nozzle_id(f, -1);
|
||||
REQUIRE(group.get_nozzle_id(f, 0) == base);
|
||||
REQUIRE(group.get_nozzle_id(f, 5) == base);
|
||||
}
|
||||
|
||||
// first-nozzle lookup agrees with the per-layer lookup for a static map.
|
||||
for (int f = 0; f < 4; ++f) {
|
||||
auto first = group.get_first_nozzle_for_filament(f);
|
||||
REQUIRE(first.has_value());
|
||||
REQUIRE(first->extruder_id == 1);
|
||||
REQUIRE(first->group_id == group.get_nozzle_id(f));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("H2C dynamic selector: per-layer nozzle ids reach the g-code surface", "[ToolOrdering][H2C][Dynamic]")
|
||||
{
|
||||
// The per-layer regroup engine
|
||||
// (plan_filament_mapping_and_order_by_combo_ranges -> 4-arg LayeredNozzleGroupResult::create)
|
||||
// produces a *selector* result whose filament->nozzle map varies across layers. This is exactly
|
||||
// what GCode reads for H2C dynamic mode: hotend_id_for_gcode_placeholder /
|
||||
// nozzle_id_for_gcode_placeholder call group->is_support_dynamic_nozzle_map() and, when true,
|
||||
// group->get_nozzle_id(filament, layer) / get_first_nozzle_for_filament(filament). Here we build
|
||||
// the selector result directly (the engine's output shape) and assert those accessors return
|
||||
// per-layer values -- the surface that "goes live" only in dynamic mode. The static path (every
|
||||
// other test above) keeps is_support_dynamic_nozzle_map() == false and a stable nozzle id, so its
|
||||
// g-code is unchanged.
|
||||
|
||||
// H2C-like fleet: extruder 0 = 1 nozzle (group 0), extruder 1 = a 3-nozzle rack (groups 1..3).
|
||||
std::vector<NozzleInfo> nozzle_list;
|
||||
for (int g = 0; g < 4; ++g) {
|
||||
NozzleInfo n;
|
||||
n.diameter = "0.4";
|
||||
n.volume_type = nvtStandard;
|
||||
n.extruder_id = (g == 0) ? 0 : 1;
|
||||
n.group_id = g;
|
||||
nozzle_list.push_back(n);
|
||||
}
|
||||
|
||||
// Three filaments; filament 2 is reassigned from physical nozzle 2 (layers 0-1) to nozzle 3
|
||||
// (layers 2-3) by the per-layer selector -- the case that sets support_dynamic_nozzle_map.
|
||||
std::vector<std::vector<int>> layer_filament_nozzle_maps = {
|
||||
{0, 1, 2}, // layer 0
|
||||
{0, 1, 2}, // layer 1
|
||||
{0, 1, 3}, // layer 2: filament 2 moved to nozzle 3
|
||||
{0, 1, 3}, // layer 3
|
||||
};
|
||||
std::vector<std::vector<unsigned int>> layer_filament_sequences = {
|
||||
{0, 1, 2}, {0, 1, 2}, {0, 1, 2}, {0, 1, 2},
|
||||
};
|
||||
std::vector<unsigned int> used_filaments = {0, 1, 2};
|
||||
|
||||
auto group_opt = LayeredNozzleGroupResult::create(layer_filament_nozzle_maps, nozzle_list, used_filaments, layer_filament_sequences);
|
||||
REQUIRE(group_opt.has_value());
|
||||
auto &group = *group_opt;
|
||||
|
||||
// The selector is active: a filament maps to more than one physical nozzle across layers.
|
||||
REQUIRE(group.is_support_dynamic_nozzle_map());
|
||||
|
||||
// Per-layer hotend/nozzle ids -- the values the dynamic g-code placeholders emit.
|
||||
REQUIRE(group.get_nozzle_id(2, 0) == 2);
|
||||
REQUIRE(group.get_nozzle_id(2, 1) == 2);
|
||||
REQUIRE(group.get_nozzle_id(2, 2) == 3); // reassigned on layer 2
|
||||
REQUIRE(group.get_nozzle_id(2, 3) == 3);
|
||||
REQUIRE(group.get_extruder_id(2, 0) == 1);
|
||||
REQUIRE(group.get_extruder_id(2, 2) == 1);
|
||||
|
||||
// Unmoved filaments keep a stable id across layers.
|
||||
REQUIRE(group.get_nozzle_id(0, 0) == 0);
|
||||
REQUIRE(group.get_nozzle_id(0, 3) == 0);
|
||||
REQUIRE(group.get_nozzle_id(1, 0) == 1);
|
||||
REQUIRE(group.get_nozzle_id(1, 3) == 1);
|
||||
|
||||
// first-nozzle lookup (used by the *_first_* placeholders / start g-code) is the first layer's id.
|
||||
auto first2 = group.get_first_nozzle_for_filament(2);
|
||||
REQUIRE(first2.has_value());
|
||||
REQUIRE(first2->group_id == 2);
|
||||
|
||||
// every physical nozzle a filament visits is reported (3mf metadata / nozzle_diameters_by_nozzle_id).
|
||||
std::set<int> fil2_nozzles;
|
||||
for (const auto &n : group.get_nozzles_for_filament(2))
|
||||
fil2_nozzles.insert(n.group_id);
|
||||
REQUIRE(fil2_nozzles == std::set<int>({2, 3}));
|
||||
}
|
||||
|
||||
TEST_CASE("Multi-nozzle reorder tolerates a filament with no nozzle (RL-48)", "[ToolOrdering][H2C][Dynamic]")
|
||||
{
|
||||
// The per-layer engine can hand reorder_filaments_for_multi_nozzle_extruder a group result that
|
||||
// resolves no nozzle for a layer's filament (a degenerate/malformed input where a layer references
|
||||
// a filament index outside the grouping map). Unguarded, that dereferences std::max_element() on an
|
||||
// empty extruder set (SIGSEGV). The guard must instead emit each layer's filaments in order and
|
||||
// return, so a bad input degrades gracefully rather than crashing.
|
||||
auto nozzle_list = single_nozzle_per_extruder(2);
|
||||
std::vector<int> filament_nozzle_map = {0}; // map only covers filament 0
|
||||
auto group_opt = LayeredNozzleGroupResult::create(filament_nozzle_map, nozzle_list, std::vector<unsigned int>{0});
|
||||
REQUIRE(group_opt.has_value());
|
||||
|
||||
std::vector<unsigned int> filament_lists = {3}; // filament 3 resolves to no nozzle
|
||||
std::vector<std::vector<unsigned int>> layer_filaments = {{3}, {3}};
|
||||
std::vector<std::vector<std::vector<float>>> flush_matrix(2, {{0.f}}); // unused on the guard path
|
||||
std::vector<std::vector<unsigned int>> sequences;
|
||||
|
||||
REQUIRE_NOTHROW(reorder_filaments_for_multi_nozzle_extruder(filament_lists, *group_opt, layer_filaments, flush_matrix, nullptr, &sequences));
|
||||
// Each layer still gets a valid sequence (its own filaments) — no reorder, no crash.
|
||||
REQUIRE(sequences.size() == layer_filaments.size());
|
||||
REQUIRE(sequences[0] == std::vector<unsigned int>{3});
|
||||
REQUIRE(sequences[1] == std::vector<unsigned int>{3});
|
||||
}
|
||||
|
||||
// The round-robin build_multi_nozzle_group_result adapter was superseded by the
|
||||
// nozzle-centric FilamentGroup engine (get_recommended_filament_maps now decides nozzle co-location
|
||||
// by flush cost, not round-robin). The two former pipeline tests are dropped:
|
||||
// * H2C multi-nozzle physical-nozzle resolution (6-arg create) is covered above by the
|
||||
// "H2C multi-nozzle: filaments get distinct nozzles" case;
|
||||
// * the single-nozzle "nozzle id == extruder id" degradation is covered above by the
|
||||
// "Single-nozzle grouping" case (build_default_nozzle_list + 3-arg create is the exact path the
|
||||
// gate-closed branch and by-object fallback use);
|
||||
// * end-to-end H2C/H2D grouping co-location is now pinned by the filament_group golden suite
|
||||
// (tests/filament_group, config_b/config_c).
|
||||
|
||||
TEST_CASE("extruder_nozzle_stats round-trips through save/parse", "[ToolOrdering][H2C]")
|
||||
{
|
||||
// The per-extruder nozzle inventory must survive save_extruder_nozzle_stats_to_string ->
|
||||
// get_extruder_nozzle_stats unchanged, so printer presets and 3mf projects persist it.
|
||||
std::vector<std::map<NozzleVolumeType, int>> stats = {
|
||||
{{nvtStandard, 1}}, // extruder 0: single standard nozzle
|
||||
{{nvtStandard, 5}, {nvtHighFlow, 1}}, // extruder 1: 6-nozzle mixed cluster
|
||||
};
|
||||
REQUIRE(get_extruder_nozzle_stats(save_extruder_nozzle_stats_to_string(stats)) == stats);
|
||||
}
|
||||
|
||||
// The filament-change-time model (MultiNozzleUtils::simulate_filament_change_time) is self-contained
|
||||
// analytic code with no slicing-pipeline caller yet; these fixtures pin its numeric output so future
|
||||
// changes and its first consumer (the filament_group golden harness) build on a locked model. Expected
|
||||
// values are hand-traced through the AMS -> selector -> extruder transport model.
|
||||
TEST_CASE("Filament-change-time model matches the BBS analytic simulation", "[MultiNozzle][H2C][ChangeTime]")
|
||||
{
|
||||
using Catch::Matchers::WithinAbs;
|
||||
|
||||
// Load/unload constants mirror the golden config_c change_time_params
|
||||
// (selector 1/1, standard 3/2): a selector move costs 1, a full AMS load 3 / unload 2.
|
||||
FilamentChangeTimeParams params;
|
||||
params.selector_load_time = 1.0f;
|
||||
params.selector_unload_time = 1.0f;
|
||||
params.standard_load_time = 3.0f;
|
||||
params.standard_unload_time = 2.0f;
|
||||
|
||||
// One extruder carrying one physical nozzle (nozzle id == extruder id == 0).
|
||||
std::vector<NozzleInfo> nozzle_list(1);
|
||||
nozzle_list[0].diameter = "0.4";
|
||||
nozzle_list[0].volume_type = nvtStandard;
|
||||
nozzle_list[0].extruder_id = 0;
|
||||
nozzle_list[0].group_id = 0;
|
||||
|
||||
// Two filaments in distinct AMS groups, printed in the order A, B, A on nozzle 0.
|
||||
std::vector<int> logical_filaments = {0, 1};
|
||||
std::vector<int> group_of_filament = {0, 1};
|
||||
std::vector<int> filament_change_seq = {0, 1, 0};
|
||||
std::vector<int> nozzle_change_seq = {0, 0, 0};
|
||||
|
||||
SECTION("no AMS pre-load: each change is a full AMS<->extruder transport")
|
||||
{
|
||||
auto r = simulate_filament_change_time(
|
||||
logical_filaments, nozzle_list, filament_change_seq, nozzle_change_seq,
|
||||
group_of_filament, params, /*ams_preload_enabled=*/{}, /*calc_sliced_time=*/true);
|
||||
// load0(3) + [unload0(2)+load1(3)] + [unload1(2)+load0(3)] = 13
|
||||
REQUIRE_THAT(r.actual_time, WithinAbs(13.0, 1e-6));
|
||||
// Single nozzle, no selector overlap => slicer estimate equals the actual time.
|
||||
REQUIRE_THAT(r.sliced_time, WithinAbs(13.0, 1e-6));
|
||||
}
|
||||
|
||||
SECTION("AMS pre-load overlaps transport, shrinking the actual time")
|
||||
{
|
||||
std::vector<bool> preload = {true, true};
|
||||
auto r = simulate_filament_change_time(
|
||||
logical_filaments, nozzle_list, filament_change_seq, nozzle_change_seq,
|
||||
group_of_filament, params, preload, /*calc_sliced_time=*/false);
|
||||
// Pre-loading the next filament into the selector runs in parallel with the current
|
||||
// extruder move, so the selector<->extruder legs dominate: 3 + (1+1) + (1+1) = 7.
|
||||
REQUIRE_THAT(r.actual_time, WithinAbs(7.0, 1e-6));
|
||||
}
|
||||
|
||||
SECTION("degenerate inputs return zero")
|
||||
{
|
||||
auto r = simulate_filament_change_time({}, nozzle_list, filament_change_seq,
|
||||
nozzle_change_seq, {}, params);
|
||||
REQUIRE_THAT(r.actual_time, WithinAbs(0.0, 1e-6));
|
||||
REQUIRE_THAT(r.sliced_time, WithinAbs(0.0, 1e-6));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("NozzleStatusRecorder tracks nozzle/extruder occupancy", "[MultiNozzle][H2C][ChangeTime]")
|
||||
{
|
||||
NozzleStatusRecorder rec;
|
||||
REQUIRE(rec.is_nozzle_empty(0));
|
||||
REQUIRE(rec.get_filament_in_nozzle(0) == -1);
|
||||
REQUIRE(rec.get_nozzle_in_extruder(0) == -1);
|
||||
|
||||
rec.set_nozzle_status(2, 5, 1); // nozzle 2 holds filament 5, mounted on extruder 1
|
||||
REQUIRE_FALSE(rec.is_nozzle_empty(2));
|
||||
REQUIRE(rec.get_filament_in_nozzle(2) == 5);
|
||||
REQUIRE(rec.get_nozzle_in_extruder(1) == 2);
|
||||
|
||||
rec.clear_nozzle_status(2);
|
||||
REQUIRE(rec.is_nozzle_empty(2));
|
||||
REQUIRE(rec.get_filament_in_nozzle(2) == -1);
|
||||
// Clearing a nozzle leaves the extruder->nozzle association intact.
|
||||
REQUIRE(rec.get_nozzle_in_extruder(1) == 2);
|
||||
}
|
||||
|
||||
TEST_CASE("Hybrid nozzle stats resolve to concrete volume types", "[ToolOrdering][H2C]")
|
||||
{
|
||||
// Extruder 0 is Standard-only; extruder 1 carries a mixed Standard + High Flow inventory
|
||||
// (the "Hybrid" flow selection). The write-back pipeline persists get_volume_map(), so the
|
||||
// result must always carry concrete per-filament volume types, never the Hybrid seed.
|
||||
auto stats = get_extruder_nozzle_stats({"Standard#1", "Standard#1|High Flow#1"});
|
||||
REQUIRE(stats.size() == 2);
|
||||
REQUIRE(stats[1].size() == 2);
|
||||
|
||||
std::vector<unsigned int> used_filaments = {0, 1, 2};
|
||||
std::vector<int> filament_map = {0, 1, 1}; // 0-based extruder ids
|
||||
std::vector<int> volume_requests = {(int) nvtStandard, (int) nvtHighFlow, (int) nvtStandard};
|
||||
std::vector<int> nozzle_requests = {0, 1, 2}; // distinct logical nozzles
|
||||
|
||||
auto group = LayeredNozzleGroupResult::create(used_filaments, filament_map, volume_requests, nozzle_requests, stats, 0.4f);
|
||||
REQUIRE(group.has_value());
|
||||
|
||||
auto volume_map = group->get_volume_map();
|
||||
REQUIRE(volume_map == volume_requests);
|
||||
for (auto fid : used_filaments)
|
||||
REQUIRE(volume_map[fid] != (int) nvtHybrid);
|
||||
|
||||
// The Hybrid seed itself matches no physical nozzle: such a request is unsatisfiable.
|
||||
std::vector<int> hybrid_requests = {(int) nvtStandard, (int) nvtHybrid, (int) nvtStandard};
|
||||
REQUIRE_FALSE(LayeredNozzleGroupResult::create(used_filaments, filament_map, hybrid_requests, nozzle_requests, stats, 0.4f).has_value());
|
||||
}
|
||||
|
||||
TEST_CASE("update_used_filament_values merges only used filaments", "[ToolOrdering][H2C]")
|
||||
{
|
||||
// The config write-back merges the engine's per-filament values over the config baseline:
|
||||
// used filaments adopt the engine value, unused filaments keep their config assignment.
|
||||
std::vector<int> old_values = {1, 1, 2, 1};
|
||||
std::vector<int> new_values = {2, 2, 1, 2};
|
||||
std::vector<unsigned int> used = {0, 2};
|
||||
|
||||
auto merged = FilamentGroupUtils::update_used_filament_values(old_values, new_values, used);
|
||||
REQUIRE(merged == std::vector<int>{2, 1, 1, 1});
|
||||
|
||||
// No used filaments => the config baseline is returned untouched.
|
||||
REQUIRE(FilamentGroupUtils::update_used_filament_values(old_values, new_values, {}) == old_values);
|
||||
}
|
||||
|
||||
TEST_CASE("Print config-index resolvers pick per-filament Hybrid slots", "[Print][H2C]")
|
||||
{
|
||||
// A 2-extruder printer whose second extruder is Hybrid (Standard + High Flow nozzles).
|
||||
// The preset-style variant columns carry one column per (extruder x volume type); apply()
|
||||
// expands them to the 3-slot layout [e1-Std, e2-Std, e2-HF].
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.option<ConfigOptionFloats>("nozzle_diameter", true)->values = {0.4, 0.4};
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "Standard#1|High Flow#2"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("outer_wall_speed", true)->values = {30., 200., 50., 500.};
|
||||
|
||||
// Three filaments: 0 -> extruder 1 (Std), 1 -> extruder 2 (Std), 2 -> extruder 2 (High Flow).
|
||||
config.option<ConfigOptionFloats>("filament_diameter", true)->values = {1.75, 1.75, 1.75};
|
||||
config.option<ConfigOptionStrings>("filament_colour", true)->values = {"#FF0000", "#00FF00", "#0000FF"};
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtStandard, (int) nvtStandard, (int) nvtHighFlow};
|
||||
|
||||
Model model;
|
||||
model.add_object("cube", "", make_cube(20, 20, 20))->add_instance();
|
||||
|
||||
Print print;
|
||||
print.apply(model, config);
|
||||
|
||||
// Stub grouping result mirroring the maps above: one nozzle per (extruder, volume type).
|
||||
std::vector<NozzleInfo> nozzle_list;
|
||||
{
|
||||
NozzleInfo n;
|
||||
n.diameter = "0.4";
|
||||
n.volume_type = nvtStandard; n.extruder_id = 0; n.group_id = 0; nozzle_list.push_back(n);
|
||||
n.volume_type = nvtStandard; n.extruder_id = 1; n.group_id = 1; nozzle_list.push_back(n);
|
||||
n.volume_type = nvtHighFlow; n.extruder_id = 1; n.group_id = 2; nozzle_list.push_back(n);
|
||||
}
|
||||
std::vector<unsigned int> used_filaments = {0, 1, 2};
|
||||
auto group = LayeredNozzleGroupResult::create(std::vector<int>{0, 1, 2}, nozzle_list, used_filaments);
|
||||
REQUIRE(group.has_value());
|
||||
print.set_nozzle_group_result(std::make_shared<LayeredNozzleGroupResult>(*group));
|
||||
|
||||
// The write-back re-expands the config and refreshes the resolver caches.
|
||||
print.update_filament_maps_to_config({1, 2, 2}, {(int) nvtStandard, (int) nvtStandard, (int) nvtHighFlow}, {0, 1, 2});
|
||||
|
||||
// The expansion must have produced the 3-slot layout the resolvers index into.
|
||||
const auto ®ion_config = print.default_region_config();
|
||||
REQUIRE(region_config.print_extruder_variant.values ==
|
||||
std::vector<std::string>({"Direct Drive Standard", "Direct Drive Standard", "Direct Drive High Flow"}));
|
||||
REQUIRE(region_config.print_extruder_id.values == std::vector<int>({1, 2, 2}));
|
||||
|
||||
SECTION("each filament resolves to its own (extruder x volume type) slot") {
|
||||
REQUIRE(print.get_nozzle_config_index(0, 0) == 0); // extruder 1, Standard
|
||||
REQUIRE(print.get_nozzle_config_index(1, 0) == 1); // extruder 2, Standard
|
||||
REQUIRE(print.get_nozzle_config_index(2, 0) == 2); // extruder 2, High Flow
|
||||
}
|
||||
|
||||
SECTION("without a group result the resolver falls back to the filament's extruder slot") {
|
||||
print.set_nozzle_group_result(nullptr);
|
||||
REQUIRE(print.get_nozzle_config_index(0, 0) == 0);
|
||||
REQUIRE(print.get_nozzle_config_index(1, 0) == 1);
|
||||
REQUIRE(print.get_nozzle_config_index(2, 0) == 1); // extruder slot, not the High Flow slot
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("Re-applying an unchanged config after slicing keeps the result valid", "[Print][H2C]")
|
||||
{
|
||||
// apply() rebuilds m_config.filament_map_2 to the real per-filament slot map, while the
|
||||
// incoming full config only ever carries the ConfigDef default for it. The engine-derived
|
||||
// key must therefore be kept out of the apply diff: the GUI re-applies right after slicing
|
||||
// completes, and a phantom filament_map_2 diff would invalidate every freshly sliced result
|
||||
// on any multi-extruder printer.
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.option<ConfigOptionFloats>("nozzle_diameter", true)->values = {0.4, 0.4};
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "Standard#1|High Flow#2"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("filament_diameter", true)->values = {1.75, 1.75, 1.75};
|
||||
config.option<ConfigOptionStrings>("filament_colour", true)->values = {"#FF0000", "#00FF00", "#0000FF"};
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtStandard, (int) nvtStandard, (int) nvtHighFlow};
|
||||
|
||||
Model model;
|
||||
ModelObject *object = model.add_object("cube", "", make_cube(20, 20, 20));
|
||||
object->add_instance()->set_offset(Vec3d(100., 100., 0.));
|
||||
|
||||
Print print;
|
||||
print.apply(model, config);
|
||||
print.process();
|
||||
REQUIRE(print.is_step_done(psSlicingFinished));
|
||||
|
||||
auto status = print.apply(model, config);
|
||||
REQUIRE(status != PrintBase::APPLY_STATUS_INVALIDATED);
|
||||
REQUIRE(print.is_step_done(psSlicingFinished));
|
||||
}
|
||||
|
||||
TEST_CASE("normalize_nozzle_map_per_layer makes per-filament assignments gap-free", "[MultiNozzle][H2C][Dynamic]")
|
||||
{
|
||||
SECTION("gaps inherit the last used nozzle, entries on used layers stay untouched") {
|
||||
// Filament 1 extrudes on layers 0 (nozzle 1) and 3 (nozzle 2); the planner leaves stale
|
||||
// entries on the layers in between.
|
||||
std::vector<std::vector<int>> maps = {
|
||||
{0, 1},
|
||||
{0, -1}, // filament 1 idle
|
||||
{0, -1}, // filament 1 idle
|
||||
{0, 2},
|
||||
};
|
||||
std::vector<std::vector<unsigned int>> filaments = {{0, 1}, {0}, {0}, {0, 1}};
|
||||
|
||||
normalize_nozzle_map_per_layer(maps, filaments);
|
||||
|
||||
REQUIRE(maps[0] == std::vector<int>({0, 1}));
|
||||
REQUIRE(maps[1] == std::vector<int>({0, 1})); // carried forward
|
||||
REQUIRE(maps[2] == std::vector<int>({0, 1})); // carried forward
|
||||
REQUIRE(maps[3] == std::vector<int>({0, 2})); // used layer untouched
|
||||
}
|
||||
|
||||
SECTION("layers before a filament's first use inherit its first nozzle") {
|
||||
std::vector<std::vector<int>> maps = {
|
||||
{0, -1},
|
||||
{0, -1},
|
||||
{0, 3}, // filament 1 first extrudes here
|
||||
};
|
||||
std::vector<std::vector<unsigned int>> filaments = {{0}, {0}, {0, 1}};
|
||||
|
||||
normalize_nozzle_map_per_layer(maps, filaments);
|
||||
|
||||
REQUIRE(maps[0] == std::vector<int>({0, 3})); // back-filled
|
||||
REQUIRE(maps[1] == std::vector<int>({0, 3})); // back-filled
|
||||
REQUIRE(maps[2] == std::vector<int>({0, 3}));
|
||||
}
|
||||
|
||||
SECTION("empty and ragged inputs are safe no-ops") {
|
||||
std::vector<std::vector<int>> empty_maps;
|
||||
std::vector<std::vector<unsigned int>> no_filaments;
|
||||
REQUIRE_NOTHROW(normalize_nozzle_map_per_layer(empty_maps, no_filaments));
|
||||
REQUIRE(empty_maps.empty());
|
||||
|
||||
// Rows of different widths and a filament list shorter than the map list.
|
||||
std::vector<std::vector<int>> ragged = {{0}, {0, 1, 2}};
|
||||
std::vector<std::vector<unsigned int>> short_filaments = {{0}};
|
||||
REQUIRE_NOTHROW(normalize_nozzle_map_per_layer(ragged, short_filaments));
|
||||
REQUIRE(ragged[0] == std::vector<int>({0}));
|
||||
}
|
||||
|
||||
SECTION("a single layer is left unchanged") {
|
||||
std::vector<std::vector<int>> maps = {{2, 1, 0}};
|
||||
std::vector<std::vector<unsigned int>> filaments = {{0, 1, 2}};
|
||||
normalize_nozzle_map_per_layer(maps, filaments);
|
||||
REQUIRE(maps[0] == std::vector<int>({2, 1, 0}));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("Stitched sequential blocks resolve per-layer after normalization", "[MultiNozzle][H2C][Dynamic]")
|
||||
{
|
||||
// Shape of the sequential (by-object) stitch: two per-object plan blocks concatenated on one
|
||||
// global layer axis, where the second object's plan moves filament 1 to another physical
|
||||
// nozzle. After normalization the 4-arg create() must detect the migration (selector result)
|
||||
// and resolve stable ids inside each object's layer range.
|
||||
std::vector<NozzleInfo> nozzle_list;
|
||||
for (int g = 0; g < 3; ++g) {
|
||||
NozzleInfo n;
|
||||
n.diameter = "0.4";
|
||||
n.volume_type = nvtStandard;
|
||||
n.extruder_id = (g == 0) ? 0 : 1;
|
||||
n.group_id = g;
|
||||
nozzle_list.push_back(n);
|
||||
}
|
||||
|
||||
// Object A (layers 0-1): filament 1 on nozzle 1, filament 0 idle until layer 1.
|
||||
// Object B (layers 2-3): filament 1 moved to nozzle 2.
|
||||
std::vector<std::vector<int>> stitched_maps = {
|
||||
{-1, 1},
|
||||
{0, 1},
|
||||
{0, 2},
|
||||
{0, 2},
|
||||
};
|
||||
std::vector<std::vector<unsigned int>> stitched_filaments = {{1}, {0, 1}, {0, 1}, {0, 1}};
|
||||
std::vector<unsigned int> used_filaments = {0, 1};
|
||||
|
||||
normalize_nozzle_map_per_layer(stitched_maps, stitched_filaments);
|
||||
REQUIRE(stitched_maps[0] == std::vector<int>({0, 1})); // filament 0 back-filled to its first nozzle
|
||||
|
||||
auto group_opt = LayeredNozzleGroupResult::create(stitched_maps, nozzle_list, used_filaments, stitched_filaments);
|
||||
REQUIRE(group_opt.has_value());
|
||||
auto &group = *group_opt;
|
||||
|
||||
// A filament on two physical nozzles across the objects => selector result.
|
||||
REQUIRE(group.is_support_dynamic_nozzle_map());
|
||||
REQUIRE(group.get_nozzle_id(1, 0) == 1);
|
||||
REQUIRE(group.get_nozzle_id(1, 1) == 1);
|
||||
REQUIRE(group.get_nozzle_id(1, 2) == 2); // second object's range
|
||||
REQUIRE(group.get_nozzle_id(1, 3) == 2);
|
||||
// The default (out-of-range) map is the first layer's normalized row.
|
||||
REQUIRE(group.get_nozzle_id(0, 999) == 0);
|
||||
REQUIRE(group.get_nozzle_id(1, 999) == 1);
|
||||
}
|
||||
|
||||
TEST_CASE("Sequential selector prints publish a stitched result and cache the plans", "[Print][H2C][Dynamic]")
|
||||
{
|
||||
// By-object + smart filament assign: the by-object branch of Print::process must plan each
|
||||
// object with nozzle-status threading, cache the plans for the g-code export, stitch them
|
||||
// into the published print-wide result, and write the grouping result back to the config
|
||||
// once (per-object orderings must not churn the config).
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.option<ConfigOptionFloats>("nozzle_diameter", true)->values = {0.4, 0.4};
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "Standard#1|High Flow#2"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtStandard};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("filament_diameter", true)->values = {1.75, 1.75};
|
||||
config.option<ConfigOptionStrings>("filament_colour", true)->values = {"#FF0000", "#00FF00"};
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtStandard, (int) nvtStandard};
|
||||
config.set_key_value("enable_filament_dynamic_map", new ConfigOptionBool(true));
|
||||
config.option<ConfigOptionEnum<FilamentMapMode>>("filament_map_mode", true)->value = FilamentMapMode::fmmAutoForFlush;
|
||||
config.option<ConfigOptionEnum<PrintSequence>>("print_sequence", true)->value = PrintSequence::ByObject;
|
||||
// Export validates flush_volumes_matrix as filaments^2 values per head.
|
||||
config.option<ConfigOptionFloats>("flush_volumes_matrix", true)->values = std::vector<double>(8, 140.);
|
||||
config.option<ConfigOptionFloats>("flush_multiplier", true)->values = {1., 1.};
|
||||
|
||||
Model model;
|
||||
ModelObject *object_a = model.add_object("cube_a", "", make_cube(20, 20, 20));
|
||||
ModelInstance *instance_a = object_a->add_instance();
|
||||
instance_a->set_offset(Vec3d(70., 100., 0.));
|
||||
ModelObject *object_b = model.add_object("cube_b", "", make_cube(20, 20, 20));
|
||||
object_b->config.set_key_value("extruder", new ConfigOptionInt(2));
|
||||
ModelInstance *instance_b = object_b->add_instance();
|
||||
instance_b->set_offset(Vec3d(150., 100., 0.));
|
||||
// The sequential instance ordering keys on arrange_order, which validate() assigns before
|
||||
// process() in the real pipeline (instances tying at 0 get dropped from the ordering);
|
||||
// initialize it here since the test drives process() directly.
|
||||
instance_a->arrange_order = 1;
|
||||
instance_b->arrange_order = 2;
|
||||
|
||||
Print print;
|
||||
print.apply(model, config);
|
||||
REQUIRE(print.objects().size() == 2);
|
||||
print.process();
|
||||
REQUIRE(print.is_step_done(psSlicingFinished));
|
||||
|
||||
auto result = print.get_layered_nozzle_group_result();
|
||||
REQUIRE(result != nullptr);
|
||||
// One cached plan per unique object, and a stitched layer axis spanning both objects.
|
||||
REQUIRE(print.sequential_dynamic_orderings().size() == 2);
|
||||
REQUIRE(result->get_layer_count() > 0);
|
||||
// The write-back mirrors the stitched result's extruder map.
|
||||
REQUIRE(print.config().filament_map.values == result->get_extruder_map(false));
|
||||
// The per-slot filament arrays stay label-consistent whether or not the stitched plan
|
||||
// actually migrated a filament (one slot per filament, plus one per extra variant).
|
||||
REQUIRE(print.config().filament_extruder_variant.values.size() == print.config().filament_self_index.values.size());
|
||||
REQUIRE(print.config().filament_self_index.values.size() >= print.config().filament_map.values.size());
|
||||
|
||||
// Export must consume the cached plans and produce g-code without throwing.
|
||||
boost::filesystem::path gcode_path = boost::filesystem::temp_directory_path() / "orca_seq_dynamic_publish_test.gcode";
|
||||
REQUIRE_NOTHROW(print.export_gcode(gcode_path.string(), nullptr, nullptr));
|
||||
REQUIRE(boost::filesystem::exists(gcode_path));
|
||||
boost::filesystem::remove(gcode_path);
|
||||
}
|
||||
|
||||
TEST_CASE("Per-variant expansion gives migrating filaments one slot per variant", "[PrintConfig][H2C][Dynamic]")
|
||||
{
|
||||
// The selector write-back rebuilds the filament arrays from the grouping result: a filament
|
||||
// that prints through several (extruder x volume type) variants keeps one slot per variant,
|
||||
// and every key grows in lockstep with the self-index / variant labels.
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
// Extruder 1 Standard, extruder 2 Hybrid (Standard + High Flow): 3 nozzle slots, 2 extruders.
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
// Two filaments with superset arrays: one column per (filament x variant).
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtStandard, (int) nvtHighFlow};
|
||||
config.option<ConfigOptionInts>("filament_self_index", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("filament_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("nozzle_temperature", true)->values = {220, 230, 240, 250};
|
||||
|
||||
std::set<std::string> key_set = {"filament_self_index", "filament_extruder_variant", "nozzle_temperature"};
|
||||
|
||||
auto make_use = [](ExtruderType et, NozzleVolumeType nvt, int extruder_id) {
|
||||
FilamentVariantUse use;
|
||||
use.extruder_type = et;
|
||||
use.nozzle_volume_type = nvt;
|
||||
use.extruder_id = extruder_id;
|
||||
return use;
|
||||
};
|
||||
|
||||
SECTION("a migrating filament expands, machine slots track each output slot") {
|
||||
std::unordered_map<int, std::vector<FilamentVariantUse>> uses;
|
||||
uses[0] = {make_use(etDirectDrive, nvtStandard, 0), make_use(etDirectDrive, nvtHighFlow, 1)};
|
||||
uses[1] = {make_use(etDirectDrive, nvtHighFlow, 1)};
|
||||
std::vector<int> slot_machine_indices;
|
||||
config.update_filament_config_values_for_multiple_extruders(config, uses, 2, 3, key_set,
|
||||
"filament_self_index", "filament_extruder_variant",
|
||||
&slot_machine_indices);
|
||||
REQUIRE(config.option<ConfigOptionInts>("filament_self_index")->values == std::vector<int>{1, 1, 2});
|
||||
REQUIRE(config.option<ConfigOptionStrings>("filament_extruder_variant")->values ==
|
||||
std::vector<std::string>({"Direct Drive Standard", "Direct Drive High Flow", "Direct Drive High Flow"}));
|
||||
REQUIRE(config.option<ConfigOptionInts>("nozzle_temperature")->values == std::vector<int>{220, 230, 250});
|
||||
// Slot 0 backs onto extruder 1 Standard; slots 1-2 onto extruder 2 High Flow.
|
||||
REQUIRE(slot_machine_indices == std::vector<int>{0, 3, 3});
|
||||
}
|
||||
|
||||
SECTION("filaments absent from the uses fall back to their static assignment") {
|
||||
std::unordered_map<int, std::vector<FilamentVariantUse>> uses;
|
||||
uses[0] = {make_use(etDirectDrive, nvtStandard, 0)};
|
||||
// Filament 1 unrouted: filament_map -> extruder 2 (Hybrid) -> volume map -> High Flow.
|
||||
config.update_filament_config_values_for_multiple_extruders(config, uses, 2, 3, key_set,
|
||||
"filament_self_index", "filament_extruder_variant");
|
||||
REQUIRE(config.option<ConfigOptionInts>("filament_self_index")->values == std::vector<int>{1, 2});
|
||||
REQUIRE(config.option<ConfigOptionInts>("nozzle_temperature")->values == std::vector<int>{220, 250});
|
||||
}
|
||||
|
||||
SECTION("a mis-sized filament_volume_map is ignored") {
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtHighFlow};
|
||||
std::unordered_map<int, std::vector<FilamentVariantUse>> uses;
|
||||
uses[0] = {make_use(etDirectDrive, nvtStandard, 0)};
|
||||
// Unrouted filament 1 keeps the extruder's own typing (Hybrid folds to Standard).
|
||||
config.update_filament_config_values_for_multiple_extruders(config, uses, 2, 3, key_set,
|
||||
"filament_self_index", "filament_extruder_variant");
|
||||
REQUIRE(config.option<ConfigOptionInts>("nozzle_temperature")->values == std::vector<int>{220, 240});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("Selector write-back expands migrating filaments and survives re-apply", "[Print][H2C][Dynamic]")
|
||||
{
|
||||
// A filament the per-layer plan moves between nozzle variants must end up with one config
|
||||
// slot per variant (so per-layer temperatures/retractions resolve correctly), the extruder
|
||||
// retract overrides must key each slot to its own variant's machine value, and an unchanged
|
||||
// re-apply must reproduce the expansion instead of trimming it back to one slot per
|
||||
// filament — a trim-back would diff the freshly written values and invalidate the result.
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.option<ConfigOptionFloats>("nozzle_diameter", true)->values = {0.4, 0.4};
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "Standard#1|High Flow#2"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
// Three filaments: 0 -> extruder 1 (Std), 1 -> extruder 2 (Std), 2 -> extruder 2, migrating
|
||||
// Standard -> High Flow between layers. Superset arrays: one column per (filament x variant).
|
||||
// filament_type must be sized to the filament count: the variant-use collection (like the
|
||||
// full-config producers) keys the per-filament loop on it.
|
||||
config.option<ConfigOptionStrings>("filament_type", true)->values = {"PLA", "PLA", "PLA"};
|
||||
config.option<ConfigOptionFloats>("filament_diameter", true)->values = {1.75, 1.75, 1.75};
|
||||
config.option<ConfigOptionStrings>("filament_colour", true)->values = {"#FF0000", "#00FF00", "#0000FF"};
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtStandard, (int) nvtStandard, (int) nvtStandard};
|
||||
config.option<ConfigOptionInts>("filament_self_index", true)->values = {1, 1, 2, 2, 3, 3};
|
||||
config.option<ConfigOptionStrings>("filament_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("nozzle_temperature", true)->values = {200, 210, 220, 230, 240, 250};
|
||||
// The migrating filament's Standard column is nil, so the override merge must fall back to
|
||||
// the machine value of the Standard slot (not the High Flow one).
|
||||
config.option<ConfigOptionFloatsNullable>("filament_retraction_length", true)->values =
|
||||
{0.5, 0.5, 0.6, 0.6, ConfigOptionFloatsNullable::nil_value(), 1.2};
|
||||
config.option<ConfigOptionFloats>("retraction_length", true)->values = {0.8, 0.9, 1.0, 1.1};
|
||||
|
||||
Model model;
|
||||
model.add_object("cube", "", make_cube(20, 20, 20))->add_instance();
|
||||
|
||||
Print print;
|
||||
print.apply(model, config);
|
||||
|
||||
// Stub grouping result: nozzles as in the resolver test; filament 2 prints on the Standard
|
||||
// nozzle at layer 0 and on the High Flow nozzle at layer 1.
|
||||
std::vector<NozzleInfo> nozzle_list;
|
||||
{
|
||||
NozzleInfo n;
|
||||
n.diameter = "0.4";
|
||||
n.volume_type = nvtStandard; n.extruder_id = 0; n.group_id = 0; nozzle_list.push_back(n);
|
||||
n.volume_type = nvtStandard; n.extruder_id = 1; n.group_id = 1; nozzle_list.push_back(n);
|
||||
n.volume_type = nvtHighFlow; n.extruder_id = 1; n.group_id = 2; nozzle_list.push_back(n);
|
||||
}
|
||||
std::vector<std::vector<int>> layer_maps = {{0, 1, 1}, {0, 1, 2}};
|
||||
std::vector<std::vector<unsigned int>> layer_seqs = {{0, 1, 2}, {0, 1, 2}};
|
||||
auto group = LayeredNozzleGroupResult::create(layer_maps, nozzle_list, {0, 1, 2}, layer_seqs);
|
||||
REQUIRE(group.has_value());
|
||||
REQUIRE(group->is_support_dynamic_nozzle_map());
|
||||
print.set_nozzle_group_result(std::make_shared<LayeredNozzleGroupResult>(*group));
|
||||
|
||||
print.update_to_config_by_nozzle_group_result(*group);
|
||||
|
||||
// Filament 2 holds two slots (Standard + High Flow), everything in lockstep.
|
||||
REQUIRE(print.config().filament_map.values == group->get_extruder_map(false));
|
||||
REQUIRE(print.config().filament_self_index.values == std::vector<int>{1, 2, 3, 3});
|
||||
REQUIRE(print.config().nozzle_temperature.values == std::vector<int>{200, 220, 240, 250});
|
||||
// The layer-aware resolver picks the slot matching each layer's variant.
|
||||
REQUIRE(print.get_filament_config_indx(2, 0) == 2);
|
||||
REQUIRE(print.get_filament_config_indx(2, 1) == 3);
|
||||
// Retract overrides: non-nil slots take the filament value; the nil Standard slot of the
|
||||
// migrating filament falls back to its own variant's machine value.
|
||||
const auto &machine_retract = print.full_print_config().option<ConfigOptionFloats>("retraction_length")->values;
|
||||
int f2_std_machine_slot = print.full_print_config().get_index_for_extruder(2, "print_extruder_id", etDirectDrive, nvtStandard,
|
||||
"print_extruder_variant");
|
||||
REQUIRE(f2_std_machine_slot >= 0);
|
||||
const std::vector<double> merged_retract = print.config().retraction_length.values;
|
||||
REQUIRE(merged_retract.size() == 4);
|
||||
REQUIRE_THAT(merged_retract[0], Catch::Matchers::WithinAbs(0.5, 1e-9));
|
||||
REQUIRE_THAT(merged_retract[1], Catch::Matchers::WithinAbs(0.6, 1e-9));
|
||||
REQUIRE_THAT(merged_retract[2], Catch::Matchers::WithinAbs(machine_retract[f2_std_machine_slot], 1e-9));
|
||||
REQUIRE_THAT(merged_retract[3], Catch::Matchers::WithinAbs(1.2, 1e-9));
|
||||
|
||||
// Re-apply the unchanged config: the persisted result must reproduce the exact expansion.
|
||||
auto status = print.apply(model, config);
|
||||
REQUIRE(status != PrintBase::APPLY_STATUS_INVALIDATED);
|
||||
REQUIRE(print.config().filament_self_index.values == std::vector<int>{1, 2, 3, 3});
|
||||
REQUIRE(print.config().nozzle_temperature.values == std::vector<int>{200, 220, 240, 250});
|
||||
REQUIRE(print.config().retraction_length.values == merged_retract);
|
||||
}
|
||||
|
||||
TEST_CASE("Filaments ordered after a migrator shift columns and the resolver tracks them", "[Print][H2C][Dynamic]")
|
||||
{
|
||||
// When a mid-list filament expands to two columns, every later filament's values move one
|
||||
// column to the right — a raw get_at(filament_id) lands in the migrator's second column.
|
||||
// The layer-aware resolver must return the shifted column for both the expanded filament
|
||||
// arrays and the merged machine overrides.
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.option<ConfigOptionFloats>("nozzle_diameter", true)->values = {0.4, 0.4};
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "Standard#1|High Flow#2"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
// Three filaments: 0 -> extruder 1 (Std), 1 -> extruder 2, migrating Standard -> High Flow
|
||||
// between layers, 2 -> extruder 2 (Std) — ordered AFTER the migrator.
|
||||
config.option<ConfigOptionStrings>("filament_type", true)->values = {"PLA", "PLA", "PLA"};
|
||||
config.option<ConfigOptionFloats>("filament_diameter", true)->values = {1.75, 1.75, 1.75};
|
||||
config.option<ConfigOptionStrings>("filament_colour", true)->values = {"#FF0000", "#00FF00", "#0000FF"};
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtStandard, (int) nvtStandard, (int) nvtStandard};
|
||||
config.option<ConfigOptionInts>("filament_self_index", true)->values = {1, 1, 2, 2, 3, 3};
|
||||
config.option<ConfigOptionStrings>("filament_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("nozzle_temperature", true)->values = {200, 210, 220, 230, 240, 250};
|
||||
config.option<ConfigOptionFloatsNullable>("filament_retraction_length", true)->values = {0.5, 0.5, 0.7, 0.9, 1.4, 1.4};
|
||||
config.option<ConfigOptionFloats>("retraction_length", true)->values = {0.8, 0.9, 1.0, 1.1};
|
||||
|
||||
Model model;
|
||||
model.add_object("cube", "", make_cube(20, 20, 20))->add_instance();
|
||||
|
||||
Print print;
|
||||
print.apply(model, config);
|
||||
|
||||
std::vector<NozzleInfo> nozzle_list;
|
||||
{
|
||||
NozzleInfo n;
|
||||
n.diameter = "0.4";
|
||||
n.volume_type = nvtStandard; n.extruder_id = 0; n.group_id = 0; nozzle_list.push_back(n);
|
||||
n.volume_type = nvtStandard; n.extruder_id = 1; n.group_id = 1; nozzle_list.push_back(n);
|
||||
n.volume_type = nvtHighFlow; n.extruder_id = 1; n.group_id = 2; nozzle_list.push_back(n);
|
||||
}
|
||||
// Filament 1: Standard nozzle on layer 0, High Flow nozzle on layer 1; filament 2 stays Standard.
|
||||
std::vector<std::vector<int>> layer_maps = {{0, 1, 1}, {0, 2, 1}};
|
||||
std::vector<std::vector<unsigned int>> layer_seqs = {{0, 1, 2}, {0, 1, 2}};
|
||||
auto group = LayeredNozzleGroupResult::create(layer_maps, nozzle_list, {0, 1, 2}, layer_seqs);
|
||||
REQUIRE(group.has_value());
|
||||
REQUIRE(group->is_support_dynamic_nozzle_map());
|
||||
print.set_nozzle_group_result(std::make_shared<LayeredNozzleGroupResult>(*group));
|
||||
|
||||
print.update_to_config_by_nozzle_group_result(*group);
|
||||
|
||||
// Filament 1 holds columns 1-2; filament 2's values shift to column 3.
|
||||
REQUIRE(print.config().filament_self_index.values == std::vector<int>{1, 2, 2, 3});
|
||||
REQUIRE(print.config().nozzle_temperature.values == std::vector<int>{200, 220, 230, 240});
|
||||
// The migrator resolves per layer to its two columns.
|
||||
REQUIRE(print.get_filament_config_indx(1, 0) == 1);
|
||||
REQUIRE(print.get_filament_config_indx(1, 1) == 2);
|
||||
// The filament after it no longer lives at its raw index on any layer.
|
||||
REQUIRE(print.get_filament_config_indx(2, 0) == 3);
|
||||
REQUIRE(print.get_filament_config_indx(2, 1) == 3);
|
||||
// Merged machine override: filament 2's value sits in the shifted column, while a raw
|
||||
// get_at(2) would read the migrator's High Flow column.
|
||||
const std::vector<double> merged = print.config().retraction_length.values;
|
||||
REQUIRE(merged.size() == 4);
|
||||
REQUIRE_THAT(merged[3], Catch::Matchers::WithinAbs(1.4, 1e-9));
|
||||
REQUIRE_THAT(merged[2], Catch::Matchers::WithinAbs(0.9, 1e-9));
|
||||
}
|
||||
|
||||
TEST_CASE("Selector slicing keeps the result valid across re-apply", "[Print][H2C][Dynamic]")
|
||||
{
|
||||
// The dynamic counterpart of the static re-apply test above: a full process() run through
|
||||
// the selector branch (whatever grouping it settles on) must leave the config in a state
|
||||
// the next apply reproduces without invalidating the freshly sliced result.
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.option<ConfigOptionFloats>("nozzle_diameter", true)->values = {0.4, 0.4};
|
||||
config.option<ConfigOptionStrings>("extruder_nozzle_stats", true)->values = {"Standard#1", "Standard#1|High Flow#2"};
|
||||
config.option<ConfigOptionEnumsGeneric>("extruder_type", true)->values = {etDirectDrive, etDirectDrive};
|
||||
config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type", true)->values = {nvtStandard, nvtHybrid};
|
||||
config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
|
||||
"Direct Drive Standard,Direct Drive High Flow"};
|
||||
config.option<ConfigOptionInts>("print_extruder_id", true)->values = {1, 1, 2, 2};
|
||||
config.option<ConfigOptionStrings>("print_extruder_variant", true)->values = {"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
config.option<ConfigOptionFloats>("filament_diameter", true)->values = {1.75, 1.75, 1.75};
|
||||
config.option<ConfigOptionStrings>("filament_colour", true)->values = {"#FF0000", "#00FF00", "#0000FF"};
|
||||
config.option<ConfigOptionInts>("filament_map", true)->values = {1, 2, 2};
|
||||
config.option<ConfigOptionInts>("filament_volume_map", true)->values = {(int) nvtStandard, (int) nvtStandard, (int) nvtHighFlow};
|
||||
config.set_key_value("enable_filament_dynamic_map", new ConfigOptionBool(true));
|
||||
config.option<ConfigOptionEnum<FilamentMapMode>>("filament_map_mode", true)->value = FilamentMapMode::fmmAutoForFlush;
|
||||
|
||||
Model model;
|
||||
ModelObject *object = model.add_object("cube", "", make_cube(20, 20, 20));
|
||||
object->add_instance()->set_offset(Vec3d(100., 100., 0.));
|
||||
|
||||
Print print;
|
||||
print.apply(model, config);
|
||||
print.process();
|
||||
REQUIRE(print.is_step_done(psSlicingFinished));
|
||||
|
||||
auto status = print.apply(model, config);
|
||||
REQUIRE(status != PrintBase::APPLY_STATUS_INVALIDATED);
|
||||
REQUIRE(print.is_step_done(psSlicingFinished));
|
||||
}
|
||||
Reference in New Issue
Block a user