GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 00:22:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed some of the new parameters

Browse Source
This commit is contained in:
Lukas Matena 2024-03-12 14:36:25 +01:00
parent cf8bada036
commit 0988bf2998
6 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Preset.cpp
View File

@ -479,7 +479,7 @@ static std::vector<std::string> 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<std::string> 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"

5
src/libslic3r/PresetBundle.cpp
View File

@ -1733,8 +1733,7 @@ void PresetBundle::update_multi_material_filament_presets()
std::vector<double> old_matrix = this->project_config.option<ConfigOptionFloats>("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<const ConfigOptionFloat*>(printers.get_edited_preset().config.option("multimaterial_purging_for_load"))->value;
const double default_unloading_purge = static_cast<const ConfigOptionFloat*>(printers.get_edited_preset().config.option("multimaterial_purging_for_unload"))->value;
const double default_purge = static_cast<const ConfigOptionFloat*>(printers.get_edited_preset().config.option("multimaterial_purging"))->value;
std::vector<double> new_matrix;
for (unsigned int i=0;i<num_extruders;++i)
@ -1743,7 +1742,7 @@ void PresetBundle::update_multi_material_filament_presets()
if (i<old_number_of_extruders && j<old_number_of_extruders)
new_matrix.push_back(old_matrix[i*old_number_of_extruders + j]);
else
new_matrix.push_back( i==j ? 0. : default_loading_purge + default_unloading_purge);
new_matrix.push_back( i==j ? 0. : default_purge);
}
this->project_config.option<ConfigOptionFloats>("wiping_volumes_matrix")->values = new_matrix;
}

6
src/libslic3r/Print.cpp
View File

@ -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"

25
src/libslic3r/PrintConfig.cpp
View File

@ -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));

6
src/libslic3r/PrintConfig.hpp
View File

@ -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))

6
src/slic3r/GUI/Tab.cpp
View File

@ -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();