3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix typo cleareance_radius -> clearance_radius

Browse source
This commit is contained in:
vovodroid 2024-08-22 09:05:19 +03:00
parent 6dc8b28529
commit e0089dfe9f
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/OrcaSlicer.cpp
View file

@ -3029,7 +3029,7 @@ int CLI::run(int argc, char **argv)
double print_height = m_print_config.opt_float("printable_height"); double print_height = m_print_config.opt_float("printable_height");
double height_to_lid = m_print_config.opt_float("extruder_clearance_height_to_lid"); double height_to_lid = m_print_config.opt_float("extruder_clearance_height_to_lid");
double height_to_rod = m_print_config.opt_float("extruder_clearance_height_to_rod"); double height_to_rod = m_print_config.opt_float("extruder_clearance_height_to_rod");
double cleareance_radius = m_print_config.opt_float("extruder_clearance_radius"); double clearance_radius = m_print_config.opt_float("extruder_clearance_radius");
//double plate_stride; //double plate_stride;
std::string bed_texture; std::string bed_texture;
@ -3749,12 +3749,12 @@ int CLI::run(int argc, char **argv)
{ {
if (((old_height_to_rod != 0.f) && (old_height_to_rod != height_to_rod)) if (((old_height_to_rod != 0.f) && (old_height_to_rod != height_to_rod))
|| ((old_height_to_lid != 0.f) && (old_height_to_lid != height_to_lid)) || ((old_height_to_lid != 0.f) && (old_height_to_lid != height_to_lid))
|| ((old_max_radius != 0.f) && (old_max_radius != cleareance_radius))) || ((old_max_radius != 0.f) && (old_max_radius != clearance_radius)))
{ {
if (is_seq_print_for_curr_plate) { if (is_seq_print_for_curr_plate) {
need_arrange = true; need_arrange = true;
BOOST_LOG_TRIVIAL(info) << boost::format("old_height_to_rod %1%, old_height_to_lid %2%, old_max_radius %3%, current height_to_rod %4%, height_to_lid %5%, cleareance_radius %6%, need arrange!") BOOST_LOG_TRIVIAL(info) << boost::format("old_height_to_rod %1%, old_height_to_lid %2%, old_max_radius %3%, current height_to_rod %4%, height_to_lid %5%, clearance_radius %6%, need arrange!")
%old_height_to_rod %old_height_to_lid %old_max_radius %height_to_rod %height_to_lid %cleareance_radius; %old_height_to_rod %old_height_to_lid %old_max_radius %height_to_rod %height_to_lid %clearance_radius;
} }
} }
} }
@ -3898,7 +3898,7 @@ int CLI::run(int argc, char **argv)
arrange_cfg.avoid_extrusion_cali_region = avoid_extrusion_cali_region; arrange_cfg.avoid_extrusion_cali_region = avoid_extrusion_cali_region;
arrange_cfg.clearance_height_to_rod = height_to_rod; arrange_cfg.clearance_height_to_rod = height_to_rod;
arrange_cfg.clearance_height_to_lid = height_to_lid; arrange_cfg.clearance_height_to_lid = height_to_lid;
arrange_cfg.cleareance_radius = cleareance_radius; arrange_cfg.clearance_radius = clearance_radius;
arrange_cfg.printable_height = print_height; arrange_cfg.printable_height = print_height;
arrange_cfg.min_obj_distance = 0; arrange_cfg.min_obj_distance = 0;
if (arrange_cfg.is_seq_print) { if (arrange_cfg.is_seq_print) {
@ -4301,7 +4301,7 @@ int CLI::run(int argc, char **argv)
arrange_cfg.avoid_extrusion_cali_region = avoid_extrusion_cali_region; arrange_cfg.avoid_extrusion_cali_region = avoid_extrusion_cali_region;
arrange_cfg.clearance_height_to_rod = height_to_rod; arrange_cfg.clearance_height_to_rod = height_to_rod;
arrange_cfg.clearance_height_to_lid = height_to_lid; arrange_cfg.clearance_height_to_lid = height_to_lid;
arrange_cfg.cleareance_radius = cleareance_radius; arrange_cfg.clearance_radius = clearance_radius;
arrange_cfg.printable_height = print_height; arrange_cfg.printable_height = print_height;
arrange_cfg.min_obj_distance = 0; arrange_cfg.min_obj_distance = 0;
if (arrange_cfg.is_seq_print) { if (arrange_cfg.is_seq_print) {

12
src/libslic3r/Arrange.cpp
View file

@ -90,10 +90,10 @@ void update_arrange_params(ArrangeParams& params, const DynamicPrintConfig* prin
params.brim_skirt_distance = skirt_distance; params.brim_skirt_distance = skirt_distance;
params.bed_shrink_x += params.brim_skirt_distance; params.bed_shrink_x += params.brim_skirt_distance;
params.bed_shrink_y += params.brim_skirt_distance; params.bed_shrink_y += params.brim_skirt_distance;
// for sequential print, we need to inflate the bed because cleareance_radius is so large // for sequential print, we need to inflate the bed because clearance_radius is so large
if (params.is_seq_print) { if (params.is_seq_print) {
params.bed_shrink_x -= params.cleareance_radius / 2; params.bed_shrink_x -= params.clearance_radius / 2;
params.bed_shrink_y -= params.cleareance_radius / 2; params.bed_shrink_y -= params.clearance_radius / 2;
} }
} }
@ -108,7 +108,7 @@ void update_selected_items_inflation(ArrangePolygons& selected, const DynamicPri
params.min_obj_distance = std::max(params.min_obj_distance, scaled(double(MAX_OUTER_NOZZLE_DIAMETER)/2+0.001)); params.min_obj_distance = std::max(params.min_obj_distance, scaled(double(MAX_OUTER_NOZZLE_DIAMETER)/2+0.001));
} }
else else
params.min_obj_distance = std::max(params.min_obj_distance, scaled(params.cleareance_radius + 0.001)); // +0.001mm to avoid clearance check fail due to rounding error params.min_obj_distance = std::max(params.min_obj_distance, scaled(params.clearance_radius + 0.001)); // +0.001mm to avoid clearance check fail due to rounding error
} }
double brim_max = 0; double brim_max = 0;
bool plate_has_tree_support = false; bool plate_has_tree_support = false;
@ -135,8 +135,8 @@ void update_unselected_items_inflation(ArrangePolygons& unselected, const Dynami
{ {
float exclusion_gap = 1.f; float exclusion_gap = 1.f;
if (params.is_seq_print) { if (params.is_seq_print) {
// bed_shrink_x is typically (-params.cleareance_radius / 2+5) for seq_print // bed_shrink_x is typically (-params.clearance_radius / 2+5) for seq_print
exclusion_gap = std::max(exclusion_gap, params.cleareance_radius / 2 + params.bed_shrink_x + 1.f); // +1mm gap so the exclusion region is not too close exclusion_gap = std::max(exclusion_gap, params.clearance_radius / 2 + params.bed_shrink_x + 1.f); // +1mm gap so the exclusion region is not too close
// dont forget to move the excluded region // dont forget to move the excluded region
for (auto& region : unselected) { for (auto& region : unselected) {
if (region.is_virt_object) region.poly.translate(scaled(params.bed_shrink_x), scaled(params.bed_shrink_y)); if (region.is_virt_object) region.poly.translate(scaled(params.bed_shrink_x), scaled(params.bed_shrink_y));

4
src/libslic3r/Arrange.hpp
View file

@ -131,7 +131,7 @@ struct ArrangeParams {
float brim_skirt_distance = 0; float brim_skirt_distance = 0;
float clearance_height_to_rod = 0; float clearance_height_to_rod = 0;
float clearance_height_to_lid = 0; float clearance_height_to_lid = 0;
float cleareance_radius = 0; float clearance_radius = 0;
float nozzle_height = 0; float nozzle_height = 0;
float printable_height = 256.0; float printable_height = 256.0;
Vec2d align_center{ 0.5,0.5 }; Vec2d align_center{ 0.5,0.5 };
@ -168,7 +168,7 @@ struct ArrangeParams {
ret += "\"brim_skirt_distance\":" + std::to_string(brim_skirt_distance) + ","; ret += "\"brim_skirt_distance\":" + std::to_string(brim_skirt_distance) + ",";
ret += "\"clearance_height_to_rod\":" + std::to_string(clearance_height_to_rod) + ","; ret += "\"clearance_height_to_rod\":" + std::to_string(clearance_height_to_rod) + ",";
ret += "\"clearance_height_to_lid\":" + std::to_string(clearance_height_to_lid) + ","; ret += "\"clearance_height_to_lid\":" + std::to_string(clearance_height_to_lid) + ",";
ret += "\"cleareance_radius\":" + std::to_string(cleareance_radius) + ","; ret += "\"clearance_radius\":" + std::to_string(clearance_radius) + ",";
ret += "\"printable_height\":" + std::to_string(printable_height) + ","; ret += "\"printable_height\":" + std::to_string(printable_height) + ",";
return ret; return ret;
} }

2
src/slic3r/GUI/Jobs/ArrangeJob.cpp
View file

@ -768,7 +768,7 @@ arrangement::ArrangeParams init_arrange_params(Plater *p)
params.clearance_height_to_rod = print_config.extruder_clearance_height_to_rod.value; params.clearance_height_to_rod = print_config.extruder_clearance_height_to_rod.value;
params.clearance_height_to_lid = print_config.extruder_clearance_height_to_lid.value; params.clearance_height_to_lid = print_config.extruder_clearance_height_to_lid.value;
params.cleareance_radius = print_config.extruder_clearance_radius.value; params.clearance_radius = print_config.extruder_clearance_radius.value;
params.printable_height = print_config.printable_height.value; params.printable_height = print_config.printable_height.value;
params.allow_rotations = settings.enable_rotation; params.allow_rotations = settings.enable_rotation;
params.nozzle_height = print.config().nozzle_height.value; params.nozzle_height = print.config().nozzle_height.value;