From 0988bf29984dcf2d919e1bc6f3e92f0c8e17c529 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 12 Mar 2024 14:36:25 +0100 Subject: [PATCH] Removed some of the new parameters --- src/libslic3r/Preset.cpp | 4 ++-- src/libslic3r/PresetBundle.cpp | 5 ++--- src/libslic3r/Print.cpp | 6 ++---- src/libslic3r/PrintConfig.cpp | 25 +++++-------------------- src/libslic3r/PrintConfig.hpp | 6 ++---- src/slic3r/GUI/Tab.cpp | 6 ++---- 6 files changed, 15 insertions(+), 37 deletions(-) diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 1f66091039..846cdb3881 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -479,7 +479,7 @@ static std::vector s_Preset_filament_options { "filament_colour", "filament_diameter", "filament_type", "filament_soluble", "filament_notes", "filament_max_volumetric_speed", "extrusion_multiplier", "filament_density", "filament_cost", "filament_spool_weight", "filament_loading_speed", "filament_loading_speed_start", "filament_load_time", "filament_unloading_speed", "filament_unloading_speed_start", "filament_unload_time", "filament_toolchange_delay", "filament_cooling_moves", "filament_stamping_loading_speed", "filament_stamping_distance", - "filament_cooling_initial_speed", "filament_loading_purge_multiplier", "filament_unloading_purge_multiplier", "filament_cooling_final_speed", "filament_ramming_parameters", "filament_minimal_purge_on_wipe_tower", + "filament_cooling_initial_speed", "filament_purge_multiplier", "filament_cooling_final_speed", "filament_ramming_parameters", "filament_minimal_purge_on_wipe_tower", "filament_multitool_ramming", "filament_multitool_ramming_volume", "filament_multitool_ramming_flow", "temperature", "idle_temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", "fan_always_on", "cooling", "min_fan_speed", "max_fan_speed", "bridge_fan_speed", "disable_fan_first_layers", "full_fan_speed_layer", "fan_below_layer_time", "slowdown_below_layer_time", "min_print_speed", @@ -510,7 +510,7 @@ static std::vector s_Preset_printer_options { "single_extruder_multi_material", "start_gcode", "end_gcode", "before_layer_gcode", "layer_gcode", "toolchange_gcode", "color_change_gcode", "pause_print_gcode", "template_custom_gcode", "between_objects_gcode", "printer_vendor", "printer_model", "printer_variant", "printer_notes", "cooling_tube_retraction", - "cooling_tube_length", "high_current_on_filament_swap", "parking_pos_retraction", "extra_loading_move", "multimaterial_purging_for_unload", "multimaterial_purging_for_load", + "cooling_tube_length", "high_current_on_filament_swap", "parking_pos_retraction", "extra_loading_move", "multimaterial_purging", "max_print_height", "default_print_profile", "inherits", "remaining_times", "silent_mode", "machine_limits_usage", "thumbnails", "thumbnails_format" diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 2e1d87d7a9..b5e9c6ff09 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -1733,8 +1733,7 @@ void PresetBundle::update_multi_material_filament_presets() std::vector old_matrix = this->project_config.option("wiping_volumes_matrix")->values; size_t old_number_of_extruders = size_t(std::sqrt(old_matrix.size())+EPSILON); if (num_extruders != old_number_of_extruders) { - const double default_loading_purge = static_cast(printers.get_edited_preset().config.option("multimaterial_purging_for_load"))->value; - const double default_unloading_purge = static_cast(printers.get_edited_preset().config.option("multimaterial_purging_for_unload"))->value; + const double default_purge = static_cast(printers.get_edited_preset().config.option("multimaterial_purging"))->value; std::vector new_matrix; for (unsigned int i=0;iproject_config.option("wiping_volumes_matrix")->values = new_matrix; } diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 65e3ab3631..94fee1e1fc 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -224,8 +224,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n || opt_key == "filament_minimal_purge_on_wipe_tower" || opt_key == "filament_cooling_initial_speed" || opt_key == "filament_cooling_final_speed" - || opt_key == "filament_loading_purge_multiplier" - || opt_key == "filament_unloading_purge_multiplier" + || opt_key == "filament_purge_multiplier" || opt_key == "filament_ramming_parameters" || opt_key == "filament_multitool_ramming" || opt_key == "filament_multitool_ramming_volume" @@ -251,8 +250,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n || opt_key == "cooling_tube_retraction" || opt_key == "cooling_tube_length" || opt_key == "extra_loading_move" - || opt_key == "multimaterial_purging_for_unload" - || opt_key == "multimaterial_purging_for_load" + || opt_key == "multimaterial_purging" || opt_key == "travel_speed" || opt_key == "travel_speed_z" || opt_key == "first_layer_speed" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 86273b921c..bb18a4d787 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1144,16 +1144,8 @@ void PrintConfigDef::init_fff_params() def->mode = comExpert; def->set_default_value(new ConfigOptionFloats { 3.4 }); - def = this->add("filament_loading_purge_multiplier", coPercents); - def->label = L("loading purge multiplier"); - def->tooltip = L(""); - def->sidetext = L("%"); - def->min = 0; - def->mode = comExpert; - def->set_default_value(new ConfigOptionPercents { 100 }); - - def = this->add("filament_unloading_purge_multiplier", coPercents); - def->label = L("unloading purge multiplier"); + def = this->add("filament_purge_multiplier", coPercents); + def->label = L("Purge multiplier"); def->tooltip = L(""); def->sidetext = L("%"); def->min = 0; @@ -2152,17 +2144,10 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(-2.)); - def = this->add("multimaterial_purging_for_unload", coFloat); - def->label = L("unloading"); + def = this->add("multimaterial_purging", coFloat); + def->label = L("Purging volume"); def->tooltip = L(""); - def->sidetext = L("mm krychlovy"); - def->mode = comAdvanced; - def->set_default_value(new ConfigOptionFloat(70)); - - def = this->add("multimaterial_purging_for_load", coFloat); - def->label = L("loading"); - def->tooltip = L(""); - def->sidetext = L("mm krychlovy"); + def->sidetext = L("mm³"); def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(70)); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 0e1778985e..f5f63c5720 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -727,8 +727,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionFloats, filament_cooling_initial_speed)) ((ConfigOptionFloats, filament_minimal_purge_on_wipe_tower)) ((ConfigOptionFloats, filament_cooling_final_speed)) - ((ConfigOptionPercents, filament_loading_purge_multiplier)) - ((ConfigOptionPercents, filament_unloading_purge_multiplier)) + ((ConfigOptionPercents, filament_purge_multiplier)) ((ConfigOptionStrings, filament_ramming_parameters)) ((ConfigOptionBools, filament_multitool_ramming)) ((ConfigOptionFloats, filament_multitool_ramming_volume)) @@ -781,8 +780,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBool, remaining_times)) ((ConfigOptionBool, silent_mode)) ((ConfigOptionFloat, extra_loading_move)) - ((ConfigOptionFloat, multimaterial_purging_for_unload)) - ((ConfigOptionFloat, multimaterial_purging_for_load)) + ((ConfigOptionFloat, multimaterial_purging)) ((ConfigOptionString, color_change_gcode)) ((ConfigOptionString, pause_print_gcode)) ((ConfigOptionString, template_custom_gcode)) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index c529e926f0..70a45aa9e7 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2273,8 +2273,7 @@ void TabFilament::build() optgroup->append_single_option_line("filament_cooling_final_speed"); optgroup->append_single_option_line("filament_stamping_loading_speed"); optgroup->append_single_option_line("filament_stamping_distance"); - optgroup->append_single_option_line("filament_loading_purge_multiplier"); - optgroup->append_single_option_line("filament_unloading_purge_multiplier"); + optgroup->append_single_option_line("filament_purge_multiplier"); create_line_with_widget(optgroup.get(), "filament_ramming_parameters", "", [this](wxWindow* parent) { auto ramming_dialog_btn = new wxButton(parent, wxID_ANY, _(L("Ramming settings"))+dots, wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); @@ -3381,8 +3380,7 @@ void TabPrinter::build_unregular_pages(bool from_initial_build/* = false*/) optgroup->append_single_option_line("cooling_tube_length"); optgroup->append_single_option_line("parking_pos_retraction"); optgroup->append_single_option_line("extra_loading_move"); - optgroup->append_single_option_line("multimaterial_purging_for_unload"); - optgroup->append_single_option_line("multimaterial_purging_for_load"); + optgroup->append_single_option_line("multimaterial_purging"); optgroup->append_single_option_line("high_current_on_filament_swap"); if (from_initial_build) page->clear();