diff --git a/resources/profiles/BBL/filament/fdm_filament_common.json b/resources/profiles/BBL/filament/fdm_filament_common.json index 8fc207cdd..208d6ac17 100644 --- a/resources/profiles/BBL/filament/fdm_filament_common.json +++ b/resources/profiles/BBL/filament/fdm_filament_common.json @@ -3,9 +3,6 @@ "name": "fdm_filament_common", "from": "system", "instantiation": "false", - "filament_colour":[ - "#00AE42" - ], "cool_plate_temp" : [ "60" ], diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index c24aa3e96..93cbf29dd 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -734,7 +734,7 @@ static std::vector s_Preset_print_options { }; static std::vector 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", "nozzle_temperature", "nozzle_temperature_initial_layer", // BBS diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 3b67a9e38..8185541d9 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -88,6 +88,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n "fan_cooling_layer_time", "full_fan_speed_layer", "filament_colour", + "default_filament_colour", "filament_diameter", "filament_density", "filament_cost", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index e4d490a27..9b902f24b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1064,13 +1064,20 @@ void PrintConfigDef::init_fff_params() def->mode = comSimple; 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->tooltip = L("Only used as a visual help on UI"); + def->tooltip = L("Default filament colour"); def->gui_type = ConfigOptionDef::GUIType::color; def->mode = comAdvanced; 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->label = L("Max volumetric speed"); def->tooltip = L("This setting stands for how much volume of filament can be melted and extruded per second. " diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 09a759ba3..1d4bb3b21 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -755,6 +755,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBools, filament_soluble)) ((ConfigOptionBools, filament_is_support)) ((ConfigOptionFloats, filament_cost)) + ((ConfigOptionStrings, default_filament_colour)) ((ConfigOptionInts, temperature_vitrification)) //BBS ((ConfigOptionFloats, filament_max_volumetric_speed)) ((ConfigOptionFloat, machine_load_filament_time)) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index ba9c94d13..d982775ed 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2421,7 +2421,7 @@ void TabFilament::build() optgroup->append_single_option_line("filament_soluble"); // BBS 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_flow_ratio"); optgroup->append_single_option_line("filament_density");