mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: open the filament_color preset 

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Idca08be5401aad1672adc46f9604338e3456f519
This commit is contained in:
qing.zhang 2022-10-24 14:58:35 +08:00 committed by Lane.Wei
parent 569f76ecf1
commit 4d8eefb1ea
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/profiles/BBL/filament/fdm_filament_common.json
View File

@ -3,6 +3,9 @@
"name": "fdm_filament_common", "name": "fdm_filament_common",
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false",
"filament_colour":[
"#00AE42"
],
"cool_plate_temp" : [ "cool_plate_temp" : [
"60" "60"
], ],

2
src/libslic3r/Preset.cpp
View File

@ -734,7 +734,7 @@ static std::vector<std::string> s_Preset_print_options {
}; };
static std::vector<std::string> s_Preset_filament_options { static std::vector<std::string> s_Preset_filament_options {
/*"filament_colour", */"filament_diameter", "filament_type", "filament_soluble", "filament_is_support", "filament_max_volumetric_speed", "filament_colour", "filament_diameter", "filament_type", "filament_soluble", "filament_is_support", "filament_max_volumetric_speed",
"filament_flow_ratio", "filament_density", "filament_cost", "filament_minimal_purge_on_wipe_tower", "filament_flow_ratio", "filament_density", "filament_cost", "filament_minimal_purge_on_wipe_tower",
"nozzle_temperature", "nozzle_temperature_initial_layer", "nozzle_temperature", "nozzle_temperature_initial_layer",
// BBS // BBS

12
src/libslic3r/PrintConfig.cpp
View File

@ -1064,12 +1064,12 @@ void PrintConfigDef::init_fff_params()
def->mode = comSimple; def->mode = comSimple;
def->set_default_value(new ConfigOptionInts { 60 }); def->set_default_value(new ConfigOptionInts { 60 });
def = this->add("filament_colour", coStrings); def = this->add("filament_colour", coStrings);
def->label = L("Color"); def->label = L("Defualt color");
def->tooltip = L("Only used as a visual help on UI"); def->tooltip = L("Only used as a visual help on UI");
def->gui_type = ConfigOptionDef::GUIType::color; def->gui_type = ConfigOptionDef::GUIType::color;
def->mode = comDevelop; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionStrings{ "#00AE42" }); def->set_default_value(new ConfigOptionStrings{"#00AE42"});
def = this->add("filament_max_volumetric_speed", coFloats); def = this->add("filament_max_volumetric_speed", coFloats);
def->label = L("Max volumetric speed"); def->label = L("Max volumetric speed");
@ -2926,7 +2926,7 @@ void PrintConfigDef::init_filament_option_keys()
"filament_diameter", "min_layer_height", "max_layer_height", "filament_diameter", "min_layer_height", "max_layer_height",
"retraction_length", "z_hop", "retraction_speed", "deretraction_speed", "retraction_length", "z_hop", "retraction_speed", "deretraction_speed",
"retract_before_wipe", "retract_restart_extra", "retraction_minimum_travel", "wipe", "wipe_distance", "retract_before_wipe", "retract_restart_extra", "retraction_minimum_travel", "wipe", "wipe_distance",
"retract_when_changing_layer", "retract_length_toolchange", "retract_restart_extra_toolchange", /*"filament_colour",*/ "retract_when_changing_layer", "retract_length_toolchange", "retract_restart_extra_toolchange", "filament_colour",
"default_filament_profile" "default_filament_profile"
}; };

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

@ -2421,7 +2421,7 @@ void TabFilament::build()
optgroup->append_single_option_line("filament_soluble"); optgroup->append_single_option_line("filament_soluble");
// BBS // BBS
optgroup->append_single_option_line("filament_is_support"); optgroup->append_single_option_line("filament_is_support");
//optgroup->append_single_option_line("filament_colour"); optgroup->append_single_option_line("filament_colour");
optgroup->append_single_option_line("filament_diameter"); optgroup->append_single_option_line("filament_diameter");
optgroup->append_single_option_line("filament_flow_ratio"); optgroup->append_single_option_line("filament_flow_ratio");
optgroup->append_single_option_line("filament_density"); optgroup->append_single_option_line("filament_density");