ENH: fix duplicate setting name

As title.

Test multi-color 3MF loading OK

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9b2791f8d020a051f934cda3027293a948b07088
This commit is contained in:
salt.wei 2022-10-26 22:41:19 +08:00 committed by Lane.Wei
parent 24ce050a91
commit c61fd447c9
6 changed files with 13 additions and 7 deletions

View file

@ -3,9 +3,6 @@
"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"
], ],

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",*/ "default_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

View file

@ -88,6 +88,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
"fan_cooling_layer_time", "fan_cooling_layer_time",
"full_fan_speed_layer", "full_fan_speed_layer",
"filament_colour", "filament_colour",
"default_filament_colour",
"filament_diameter", "filament_diameter",
"filament_density", "filament_density",
"filament_cost", "filament_cost",

View file

@ -1064,13 +1064,20 @@ 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("default_filament_colour", coStrings);
def->label = L("Defualt color"); def->label = L("Defualt color");
def->tooltip = L("Only used as a visual help on UI"); def->tooltip = L("Default filament colour");
def->gui_type = ConfigOptionDef::GUIType::color; def->gui_type = ConfigOptionDef::GUIType::color;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionStrings{"#00AE42"}); def->set_default_value(new ConfigOptionStrings{"#00AE42"});
def = this->add("filament_colour", coStrings);
def->label = L("Color");
def->tooltip = L("Only used as a visual help on UI");
def->gui_type = ConfigOptionDef::GUIType::color;
def->mode = comDevelop;
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");
def->tooltip = L("This setting stands for how much volume of filament can be melted and extruded per second. " def->tooltip = L("This setting stands for how much volume of filament can be melted and extruded per second. "

View file

@ -755,6 +755,7 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionBools, filament_soluble)) ((ConfigOptionBools, filament_soluble))
((ConfigOptionBools, filament_is_support)) ((ConfigOptionBools, filament_is_support))
((ConfigOptionFloats, filament_cost)) ((ConfigOptionFloats, filament_cost))
((ConfigOptionStrings, default_filament_colour))
((ConfigOptionInts, temperature_vitrification)) //BBS ((ConfigOptionInts, temperature_vitrification)) //BBS
((ConfigOptionFloats, filament_max_volumetric_speed)) ((ConfigOptionFloats, filament_max_volumetric_speed))
((ConfigOptionFloat, machine_load_filament_time)) ((ConfigOptionFloat, machine_load_filament_time))

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("default_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");