From a6084d01bda78ee8eb12cbc529321261bee677ee Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Wed, 21 May 2025 20:56:13 +0800 Subject: [PATCH] ENH: add placeholder to check whether filaments is BBL 1.Also add some side texts jira: STUDIO-12308,STUDIO-12309 Signed-off-by: xun.zhang Change-Id: I16f21d001cf0c87620a8d7c93b33af4f63981624 (cherry picked from commit 31451dcd3310720692ec2748962f379ac3c50cf4) --- src/libslic3r/GCode.cpp | 5 +++++ src/libslic3r/PrintConfig.cpp | 3 +++ src/libslic3r/PrintConfig.hpp | 1 + 3 files changed, 9 insertions(+) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 9441aef350..bc219f694e 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2684,6 +2684,11 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato this->placeholder_parser().set("plate_name", new ConfigOptionString(print.get_plate_name())); this->placeholder_parser().set("first_layer_height", new ConfigOptionFloat(m_config.initial_layer_print_height.value)); + auto used_filaments = print.get_slice_used_filaments(false); + this->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 341d2ae55c..acfe872f87 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2183,6 +2183,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); @@ -2192,6 +2193,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); @@ -4473,6 +4475,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 a5a1133f91..0d5e497e68 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1232,6 +1232,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionStrings, filament_type)) ((ConfigOptionBools, filament_soluble)) ((ConfigOptionStrings, filament_ids)) + ((ConfigOptionStrings, filament_vendor)) ((ConfigOptionBools, filament_is_support)) ((ConfigOptionInts, filament_printable)) ((ConfigOptionFloats, filament_change_length))