From de5fa59153acc536f5830328be02cfb9fad873fd Mon Sep 17 00:00:00 2001 From: anselor Date: Sat, 15 Jun 2024 00:48:45 -0400 Subject: [PATCH] =?UTF-8?q?Add=20filament=20types=20from=20the=20Create=20?= =?UTF-8?q?Filament=20dialog=20to=20the=20Edit=20dialog=E2=80=A6=20(#5705)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add filament types from the Create Filament dialog to the Edit dialog. Baffling why so much information is copied around... --- src/libslic3r/PrintConfig.cpp | 37 +++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index df166a49be..f8461a28a1 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1811,7 +1811,7 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionPercents{ 100 }); -def = this->add("filament_loading_speed", coFloats); + def = this->add("filament_loading_speed", coFloats); def->label = L("Loading speed"); def->tooltip = L("Speed used for loading the filament on the wipe tower."); def->sidetext = L("mm/s"); @@ -1950,28 +1950,41 @@ def = this->add("filament_loading_speed", coFloats); def->tooltip = L("The material type of filament"); def->gui_type = ConfigOptionDef::GUIType::f_enum_open; def->gui_flags = "show_value"; - def->enum_values.push_back("PLA"); + def->enum_values.push_back("ABS"); + def->enum_values.push_back("ABS-GF"); def->enum_values.push_back("ASA"); - def->enum_values.push_back("PETG"); - def->enum_values.push_back("TPU"); - def->enum_values.push_back("PC"); - def->enum_values.push_back("PC-CF"); + def->enum_values.push_back("ASA-Aero"); + def->enum_values.push_back("BVOH"); + def->enum_values.push_back("EVA"); + def->enum_values.push_back("HIPS"); def->enum_values.push_back("PA"); def->enum_values.push_back("PA-CF"); + def->enum_values.push_back("PA-GF"); def->enum_values.push_back("PA6-CF"); def->enum_values.push_back("PA11-CF"); - def->enum_values.push_back("PLA-CF"); + def->enum_values.push_back("PC"); + def->enum_values.push_back("PC-CF"); + def->enum_values.push_back("PCTG"); + def->enum_values.push_back("PE"); + def->enum_values.push_back("PE-CF"); def->enum_values.push_back("PET-CF"); + def->enum_values.push_back("PETG"); def->enum_values.push_back("PETG-CF"); - def->enum_values.push_back("PVA"); - def->enum_values.push_back("PVB"); - def->enum_values.push_back("HIPS"); + def->enum_values.push_back("PHA"); + def->enum_values.push_back("PLA"); def->enum_values.push_back("PLA-AERO"); - def->enum_values.push_back("PPS"); - def->enum_values.push_back("PPS-CF"); + def->enum_values.push_back("PLA-CF"); + def->enum_values.push_back("PP"); + def->enum_values.push_back("PP-CF"); + def->enum_values.push_back("PP-GF"); def->enum_values.push_back("PPA-CF"); def->enum_values.push_back("PPA-GF"); + def->enum_values.push_back("PPS"); + def->enum_values.push_back("PPS-CF"); + def->enum_values.push_back("PVA"); + def->enum_values.push_back("PVB"); + def->enum_values.push_back("TPU"); def->mode = comSimple; def->set_default_value(new ConfigOptionStrings { "PLA" });