diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index f094b7a82..109b51d02 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2359,6 +2359,11 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato m_placeholder_parser.set("z_offset", new ConfigOptionFloat(0.0f)); m_placeholder_parser.set("plate_name", new ConfigOptionString(print.get_plate_name())); + auto used_filaments = print.get_slice_used_filaments(false); + m_placeholder_parser.set("is_all_bbl_filament", std::all_of(used_filaments.begin(), used_filaments.end(), [&](auto idx) { + return m_config.filament_vendor.values[idx] == "Bambu Lab"; + })); + //add during_print_exhaust_fan_speed std::vector during_print_exhaust_fan_speed_num; during_print_exhaust_fan_speed_num.reserve(m_config.during_print_exhaust_fan_speed.size()); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 61a8b532c..1515ed0b2 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1741,6 +1741,7 @@ void PrintConfigDef::init_fff_params() def->nullable = true; def->min = 0; def->max = max_temp; + def->sidetext = "°C"; def->set_default_value(new ConfigOptionIntsNullable{0}); def = this->add("filament_flush_volumetric_speed", coFloats); @@ -1750,6 +1751,7 @@ void PrintConfigDef::init_fff_params() def->nullable = true; def->min = 0; def->max = 200; + def->sidetext = L("mm³/s"); def->set_default_value(new ConfigOptionFloatsNullable{ 0 }); def = this->add("filament_max_volumetric_speed", coFloats); @@ -3419,6 +3421,7 @@ void PrintConfigDef::init_fff_params() def->nullable = true; def->min = 0; def->max = 10; + def->sidetext = L("mm"); def->set_default_value(new ConfigOptionFloatsNullable{10}); def = this->add("retract_length_toolchange", coFloats); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 7d644201b..6ba18de3e 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1036,6 +1036,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionStrings, filament_type)) ((ConfigOptionBools, filament_soluble)) ((ConfigOptionStrings, filament_ids)) + ((ConfigOptionStrings, filament_vendor)) ((ConfigOptionBools, filament_is_support)) ((ConfigOptionInts, filament_printable)) ((ConfigOptionEnumsGeneric, filament_scarf_seam_type))