3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clamp the invalid extruders to the default extruder (with index 1),

Browse source 
not to the last extruder. This is consistent with the UI preview.
This commit is contained in:
bubnikv 2018-12-07 09:32:54 +01:00
parent 512677ed73
commit b4216fbda9
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libslic3r/Print.cpp
View file

@ -360,13 +360,20 @@ double Print::max_allowed_layer_height() const
return nozzle_diameter_max; return nozzle_diameter_max;
} }
static void clamp_exturder_to_default(ConfigOptionInt &opt, size_t num_extruders)
{
if (opt.value > (int)num_extruders)
// assign the default extruder
opt.value = 1;
}
static PrintObjectConfig object_config_from_model(const PrintObjectConfig &default_object_config, const ModelObject &object, size_t num_extruders) static PrintObjectConfig object_config_from_model(const PrintObjectConfig &default_object_config, const ModelObject &object, size_t num_extruders)
{ {
PrintObjectConfig config = default_object_config; PrintObjectConfig config = default_object_config;
normalize_and_apply_config(config, object.config); normalize_and_apply_config(config, object.config);
// Clamp extruders to the number of extruders this printer is physically equipped with. // Clamp invalid extruders to the default extruder (with index 1).
config.support_material_extruder.value = std::min(config.support_material_extruder.value, (int)num_extruders); clamp_exturder_to_default(config.support_material_extruder, num_extruders);
config.support_material_interface_extruder.value = std::min(config.support_material_interface_extruder.value, (int)num_extruders); clamp_exturder_to_default(config.support_material_interface_extruder, num_extruders);
return config; return config;
} }
@ -377,10 +384,10 @@ static PrintRegionConfig region_config_from_model_volume(const PrintRegionConfig
normalize_and_apply_config(config, volume.config); normalize_and_apply_config(config, volume.config);
if (! volume.material_id().empty()) if (! volume.material_id().empty())
normalize_and_apply_config(config, volume.material()->config); normalize_and_apply_config(config, volume.material()->config);
// Clamp extruders to the number of extruders this printer is physically equipped with. // Clamp invalid extruders to the default extruder (with index 1).
config.infill_extruder.value = std::min(config.infill_extruder.value, (int)num_extruders); clamp_exturder_to_default(config.infill_extruder, num_extruders);
config.perimeter_extruder.value = std::min(config.perimeter_extruder.value, (int)num_extruders); clamp_exturder_to_default(config.perimeter_extruder, num_extruders);
config.solid_infill_extruder.value = std::min(config.solid_infill_extruder.value, (int)num_extruders); clamp_exturder_to_default(config.solid_infill_extruder, num_extruders);
return config; return config;
} }