diff --git a/resources/ui_layout/sla_print.ui b/resources/ui_layout/sla_print.ui index 5075a7611..a41357837 100644 --- a/resources/ui_layout/sla_print.ui +++ b/resources/ui_layout/sla_print.ui @@ -13,6 +13,8 @@ group:Support head setting:support_head_width group:Support pillar setting:support_pillar_diameter + setting:support_small_pillar_diameter_percent + setting:support_max_bridges_on_pillar setting:support_pillar_connection_mode setting:support_buildplate_only # TODO: This parameter is not used at the moment. @@ -21,8 +23,8 @@ group:Support pillar setting:support_base_height setting:support_base_safety_distance # Mirrored parameter from Pad page for toggling elevation on the same page - setting:pad_around_object setting:support_object_elevation + support_object_elevation_description group:Connection of the support sticks and junctions setting:support_critical_angle setting:support_max_bridge_length @@ -48,6 +50,13 @@ group:Pad setting:pad_object_connector_width setting:pad_object_connector_penetration +page:Hollowing:hollowing +group:Hollowing + setting:hollowing_enable + setting:hollowing_min_thickness + setting:hollowing_quality + setting:hollowing_closing_distance + page:Advanced:wrench group:Slicing setting:slice_closing_radius diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 64bd620c1..031a6d1f1 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -5271,6 +5271,9 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va float v = boost::lexical_cast(value); if (v > 0) value = boost::lexical_cast(-v); + } + else if ("elefant_foot_min_width" == opt_key) { + opt_key = "elephant_foot_min_width"; } else if (opt_key == "thumbnails") { if (value.empty()) value = "0x0,0x0"; @@ -5537,8 +5540,8 @@ void PrintConfigDef::to_prusa(t_config_option_key& opt_key, std::string& value, value = "0"; } } - } else if ("elefant_foot_min_width" == opt_key) { - opt_key = "elephant_foot_min_width"; + } else if ("elephant_foot_min_width" == opt_key) { + opt_key = "elefant_foot_min_width"; } else if("first_layer_acceleration" == opt_key || "infill_acceleration" == opt_key || "bridge_acceleration" == opt_key || "default_acceleration" == opt_key || "overhangs_speed" == opt_key || "perimeter_acceleration" == opt_key){ if (value.find("%") != std::string::npos) value = "0"; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index a8fcce485..43d0392d1 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1953,6 +1953,16 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page) }; current_group->append_line(current_line); current_page->descriptions.push_back("volumetric_speed"); + } else if(boost::starts_with(full_line, "support_object_elevation_description")) { + TabSLAPrint* tab = nullptr; + if ((tab = dynamic_cast(this)) == nullptr) continue; + Line line{ "", "" }; + line.full_width = 1; + line.widget = [this, tab](wxWindow* parent) { + return description_line_widget(parent, &(tab->m_support_object_elevation_description_line)); + }; + current_group->append_line(line); + current_page->descriptions.push_back("support_object_elevation"); } else if (boost::starts_with(full_line, "print_host_upload_description")) { TabPrinter* tab = nullptr; if ((tab = dynamic_cast(this)) == nullptr) continue;