diff --git a/resources/profiles/BBL/filament/Bambu PET-CF @base.json b/resources/profiles/BBL/filament/Bambu PET-CF @base.json index 5dc7f5cc7..dd9e026f4 100644 --- a/resources/profiles/BBL/filament/Bambu PET-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PET-CF @base.json @@ -87,7 +87,7 @@ "textured_plate_temp_initial_layer": [ "100" ], - "filament_category": [ + "filament_adhesiveness_category": [ "800" ], "impact_strength_z":["4.5"], diff --git a/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json b/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json index 41763092d..03553506d 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json @@ -33,7 +33,7 @@ "slow_down_layer_time": [ "6" ], - "filament_category": [ + "filament_adhesiveness_category": [ "703" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Bambu Support For PLA @base.json b/resources/profiles/BBL/filament/Bambu Support For PLA @base.json index e326a1738..c289896df 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PLA @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PLA @base.json @@ -30,7 +30,7 @@ "slow_down_layer_time": [ "8" ], - "filament_category": [ + "filament_adhesiveness_category": [ "702" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json b/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json index 9462afaa3..88b356514 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json @@ -57,7 +57,7 @@ "textured_plate_temp_initial_layer": [ "60" ], - "filament_category": [ + "filament_adhesiveness_category": [ "705" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Bambu Support G @base.json b/resources/profiles/BBL/filament/Bambu Support G @base.json index c3973642a..dfc053abf 100644 --- a/resources/profiles/BBL/filament/Bambu Support G @base.json +++ b/resources/profiles/BBL/filament/Bambu Support G @base.json @@ -36,7 +36,7 @@ "slow_down_layer_time": [ "6" ], - "filament_category": [ + "filament_adhesiveness_category": [ "701" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Bambu Support W @base.json b/resources/profiles/BBL/filament/Bambu Support W @base.json index 58775b59d..659474595 100644 --- a/resources/profiles/BBL/filament/Bambu Support W @base.json +++ b/resources/profiles/BBL/filament/Bambu Support W @base.json @@ -30,7 +30,7 @@ "slow_down_layer_time": [ "8" ], - "filament_category": [ + "filament_adhesiveness_category": [ "700" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/Bambu Support for ABS @base.json b/resources/profiles/BBL/filament/Bambu Support for ABS @base.json index 58c5f39b8..cad3fb4f5 100644 --- a/resources/profiles/BBL/filament/Bambu Support for ABS @base.json +++ b/resources/profiles/BBL/filament/Bambu Support for ABS @base.json @@ -39,7 +39,7 @@ "temperature_vitrification": [ "90" ], - "filament_category": [ + "filament_adhesiveness_category": [ "706" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Fiberon PET-CF @base.json b/resources/profiles/BBL/filament/Fiberon PET-CF @base.json index dab61c501..ce0c5644d 100644 --- a/resources/profiles/BBL/filament/Fiberon PET-CF @base.json +++ b/resources/profiles/BBL/filament/Fiberon PET-CF @base.json @@ -83,7 +83,7 @@ "textured_plate_temp_initial_layer": [ "70" ], - "filament_category": [ + "filament_adhesiveness_category": [ "800" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/Generic BVOH @base.json b/resources/profiles/BBL/filament/Generic BVOH @base.json index ca35ccbcb..551976dd3 100644 --- a/resources/profiles/BBL/filament/Generic BVOH @base.json +++ b/resources/profiles/BBL/filament/Generic BVOH @base.json @@ -5,7 +5,7 @@ "from": "system", "filament_id": "GFS97", "instantiation": "false", - "filament_category": [ + "filament_adhesiveness_category": [ "797" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PE @base.json b/resources/profiles/BBL/filament/Generic PE @base.json index 8826da3d5..e7744a8a5 100644 --- a/resources/profiles/BBL/filament/Generic PE @base.json +++ b/resources/profiles/BBL/filament/Generic PE @base.json @@ -29,7 +29,7 @@ "temperature_vitrification": [ "70" ], - "filament_category": [ + "filament_adhesiveness_category": [ "901" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/Generic PE-CF @base.json b/resources/profiles/BBL/filament/Generic PE-CF @base.json index 7ae0dc835..97a8cf35b 100644 --- a/resources/profiles/BBL/filament/Generic PE-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PE-CF @base.json @@ -32,7 +32,7 @@ "temperature_vitrification": [ "70" ], - "filament_category": [ + "filament_adhesiveness_category": [ "901" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_abs.json b/resources/profiles/BBL/filament/fdm_filament_abs.json index efe57c701..979b4b8d8 100644 --- a/resources/profiles/BBL/filament/fdm_filament_abs.json +++ b/resources/profiles/BBL/filament/fdm_filament_abs.json @@ -85,7 +85,7 @@ "textured_plate_temp_initial_layer": [ "90" ], - "filament_category": [ + "filament_adhesiveness_category": [ "200" ], "filament_end_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_asa.json b/resources/profiles/BBL/filament/fdm_filament_asa.json index 7ca66ba6d..731866c84 100644 --- a/resources/profiles/BBL/filament/fdm_filament_asa.json +++ b/resources/profiles/BBL/filament/fdm_filament_asa.json @@ -85,7 +85,7 @@ "textured_plate_temp_initial_layer": [ "90" ], - "filament_category": [ + "filament_adhesiveness_category": [ "200" ], "filament_end_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_hips.json b/resources/profiles/BBL/filament/fdm_filament_hips.json index b2482996d..e0ce90027 100644 --- a/resources/profiles/BBL/filament/fdm_filament_hips.json +++ b/resources/profiles/BBL/filament/fdm_filament_hips.json @@ -82,7 +82,7 @@ "textured_plate_temp_initial_layer": [ "90" ], - "filament_category": [ + "filament_adhesiveness_category": [ "798" ], "filament_end_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_pa.json b/resources/profiles/BBL/filament/fdm_filament_pa.json index 546ad0528..48e13610d 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pa.json +++ b/resources/profiles/BBL/filament/fdm_filament_pa.json @@ -85,7 +85,7 @@ "textured_plate_temp_initial_layer": [ "100" ], - "filament_category": [ + "filament_adhesiveness_category": [ "400" ], "filament_end_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_pc.json b/resources/profiles/BBL/filament/fdm_filament_pc.json index 49f257fc4..dc7da534c 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pc.json +++ b/resources/profiles/BBL/filament/fdm_filament_pc.json @@ -85,7 +85,7 @@ "textured_plate_temp_initial_layer": [ "110" ], - "filament_category": [ + "filament_adhesiveness_category": [ "500" ], "filament_end_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_pet.json b/resources/profiles/BBL/filament/fdm_filament_pet.json index efcad4f15..3bdac0863 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pet.json +++ b/resources/profiles/BBL/filament/fdm_filament_pet.json @@ -64,7 +64,7 @@ "textured_plate_temp_initial_layer": [ "80" ], - "filament_category": [ + "filament_adhesiveness_category": [ "300" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_pla.json b/resources/profiles/BBL/filament/fdm_filament_pla.json index 9ac244048..4e9c0f187 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pla.json +++ b/resources/profiles/BBL/filament/fdm_filament_pla.json @@ -76,7 +76,7 @@ "textured_plate_temp_initial_layer": [ "55" ], - "filament_category": [ + "filament_adhesiveness_category": [ "100" ], "impact_strength_z":["10.0"], diff --git a/resources/profiles/BBL/filament/fdm_filament_pp.json b/resources/profiles/BBL/filament/fdm_filament_pp.json index 9bda61f8d..228ae4c1a 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pp.json +++ b/resources/profiles/BBL/filament/fdm_filament_pp.json @@ -85,7 +85,7 @@ "textured_plate_temp_initial_layer": [ "55" ], - "filament_category": [ + "filament_adhesiveness_category": [ "902" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_pps.json b/resources/profiles/BBL/filament/fdm_filament_pps.json index 4c9f5f05c..d529a9f7f 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pps.json +++ b/resources/profiles/BBL/filament/fdm_filament_pps.json @@ -82,7 +82,7 @@ "textured_plate_temp_initial_layer": [ "110" ], - "filament_category": [ + "filament_adhesiveness_category": [ "801" ], "filament_end_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_pva.json b/resources/profiles/BBL/filament/fdm_filament_pva.json index 2ef17b828..3452a63f6 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pva.json +++ b/resources/profiles/BBL/filament/fdm_filament_pva.json @@ -85,7 +85,7 @@ "textured_plate_temp_initial_layer": [ "55" ], - "filament_category": [ + "filament_adhesiveness_category": [ "704" ], "filament_start_gcode": [ diff --git a/resources/profiles/BBL/filament/fdm_filament_tpu.json b/resources/profiles/BBL/filament/fdm_filament_tpu.json index d80217ea6..fda65cd49 100644 --- a/resources/profiles/BBL/filament/fdm_filament_tpu.json +++ b/resources/profiles/BBL/filament/fdm_filament_tpu.json @@ -79,7 +79,7 @@ "textured_plate_temp_initial_layer": [ "35" ], - "filament_category": [ + "filament_adhesiveness_category": [ "600" ], "filament_start_gcode": [ diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp index 0599147f9..e25ba25df 100644 --- a/src/libslic3r/GCode/WipeTower.cpp +++ b/src/libslic3r/GCode/WipeTower.cpp @@ -1414,7 +1414,7 @@ void WipeTower::set_extruder(size_t idx, const PrintConfig& config) m_filpar[idx].is_support = config.filament_is_support.get_at(idx); m_filpar[idx].nozzle_temperature = config.nozzle_temperature.get_at(idx); m_filpar[idx].nozzle_temperature_initial_layer = config.nozzle_temperature_initial_layer.get_at(idx); - m_filpar[idx].category = config.filament_category.get_at(idx); + m_filpar[idx].category = config.filament_adhesiveness_category.get_at(idx); // If this is a single extruder MM printer, we will use all the SE-specific config values. // Otherwise, the defaults will be used to turn off the SE stuff. @@ -3302,10 +3302,10 @@ void WipeTower::toolchange_wipe_new(WipeTowerWriter &writer, const box_coordinat if (is_first_layer()) { writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) + std::to_string(m_perimeter_width) + "\n"); } } -WipeTower::WipeTowerBlock &WipeTower::get_block_by_category(int filament_category) +WipeTower::WipeTowerBlock &WipeTower::get_block_by_category(int filament_adhesiveness_category) { - auto iter = std::find_if(m_wipe_tower_blocks.begin(), m_wipe_tower_blocks.end(), [&filament_category](const WipeTower::WipeTowerBlock &item) { - return item.filament_category == filament_category; + auto iter = std::find_if(m_wipe_tower_blocks.begin(), m_wipe_tower_blocks.end(), [&filament_adhesiveness_category](const WipeTower::WipeTowerBlock &item) { + return item.filament_adhesiveness_category == filament_adhesiveness_category; }); if (iter != m_wipe_tower_blocks.end()) { @@ -3314,17 +3314,17 @@ WipeTower::WipeTowerBlock &WipeTower::get_block_by_category(int filament_categor else { WipeTower::WipeTowerBlock new_block; new_block.block_id = m_wipe_tower_blocks.size(); - new_block.filament_category = filament_category; + new_block.filament_adhesiveness_category = filament_adhesiveness_category; m_wipe_tower_blocks.emplace_back(new_block); return m_wipe_tower_blocks.back(); } } -void WipeTower::add_depth_to_block(int filament_id, int filament_category, float depth, bool is_nozzle_change) +void WipeTower::add_depth_to_block(int filament_id, int filament_adhesiveness_category, float depth, bool is_nozzle_change) { std::vector &layer_depth = m_all_layers_depth[m_cur_layer_id]; - auto iter = std::find_if(layer_depth.begin(), layer_depth.end(), [&filament_category](const WipeTower::BlockDepthInfo &item) { - return item.category == filament_category; + auto iter = std::find_if(layer_depth.begin(), layer_depth.end(), [&filament_adhesiveness_category](const WipeTower::BlockDepthInfo &item) { + return item.category == filament_adhesiveness_category; }); if (iter != layer_depth.end()) { @@ -3334,7 +3334,7 @@ void WipeTower::add_depth_to_block(int filament_id, int filament_category, float } else { WipeTower::BlockDepthInfo new_block; - new_block.category = filament_category; + new_block.category = filament_adhesiveness_category; new_block.depth = depth; if (is_nozzle_change) new_block.nozzle_change_depth += depth; @@ -3406,8 +3406,8 @@ void WipeTower::generate_wipe_tower_blocks() for (auto& info : m_plan) { for (const WipeTowerInfo::ToolChange &tool_change : info.tool_changes) { if (is_in_same_extruder(tool_change.old_tool, tool_change.new_tool)) { - int filament_category = get_filament_category(tool_change.new_tool); - add_depth_to_block(tool_change.new_tool, filament_category, tool_change.required_depth); + int filament_adhesiveness_category = get_filament_category(tool_change.new_tool); + add_depth_to_block(tool_change.new_tool, filament_adhesiveness_category, tool_change.required_depth); } else { int old_filament_category = get_filament_category(tool_change.old_tool); @@ -3450,12 +3450,12 @@ void WipeTower::generate_wipe_tower_blocks() for (WipeTowerBlock& block : m_wipe_tower_blocks) { for (int layer_id = 0; layer_id < all_layer_category_to_depth.size(); ++layer_id) { std::unordered_map &category_to_depth = all_layer_category_to_depth[layer_id]; - if (is_approx(category_to_depth[block.filament_category], 0.f)) { + if (is_approx(category_to_depth[block.filament_adhesiveness_category], 0.f)) { int layer_count = solid_infill_layer; while (layer_count > 0) { if (layer_id + layer_count < all_layer_category_to_depth.size()) { std::unordered_map& up_layer_depth = all_layer_category_to_depth[layer_id + layer_count]; - if (!is_approx(up_layer_depth[block.filament_category], 0.f)) { + if (!is_approx(up_layer_depth[block.filament_adhesiveness_category], 0.f)) { block.solid_infill[layer_id] = true; break; } @@ -3688,7 +3688,7 @@ void WipeTower::generate_new(std::vector layer_depths; std::vector solid_infill; float depth{0}; @@ -341,8 +341,8 @@ public: int m_last_block_id; // help function - WipeTowerBlock& get_block_by_category(int filament_category); - void add_depth_to_block(int filament_id, int filament_category, float depth, bool is_nozzle_change = false); + WipeTowerBlock& get_block_by_category(int filament_adhesiveness_category); + void add_depth_to_block(int filament_id, int filament_adhesiveness_category, float depth, bool is_nozzle_change = false); int get_filament_category(int filament_id); bool is_in_same_extruder(int filament_id_1, int filament_id_2); void reset_block_status(); diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index c21aa7661..d633926fa 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -910,7 +910,7 @@ static std::vector s_Preset_print_options { static std::vector s_Preset_filament_options { /*"filament_colour", */ "default_filament_colour","required_nozzle_HRC","filament_diameter", "filament_type", "filament_soluble", "filament_is_support","filament_scarf_seam_type", "filament_scarf_height", "filament_scarf_gap","filament_scarf_length", "filament_max_volumetric_speed", "impact_strength_z", - "filament_flow_ratio", "filament_density", "filament_category", "filament_cost", "filament_minimal_purge_on_wipe_tower", + "filament_flow_ratio", "filament_density", "filament_adhesiveness_category", "filament_cost", "filament_minimal_purge_on_wipe_tower", "nozzle_temperature", "nozzle_temperature_initial_layer", // BBS "cool_plate_temp", "eng_plate_temp", "hot_plate_temp", "textured_plate_temp", "cool_plate_temp_initial_layer", "eng_plate_temp_initial_layer", "hot_plate_temp_initial_layer","textured_plate_temp_initial_layer", diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index f53ea7c4a..dcd6fbc87 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -266,7 +266,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n || opt_key == "filament_map_mode" || opt_key == "filament_map" || opt_key == "unprintable_filament_map" - || opt_key == "filament_category" + || opt_key == "filament_adhesiveness_category" //|| opt_key == "wipe_tower_bridging" || opt_key == "wipe_tower_no_sparse_layers" || opt_key == "flush_volumes_matrix" @@ -2714,8 +2714,8 @@ void Print::_make_wipe_tower() wipe_tower.set_used_filament_ids(std::vector(used_filament_ids.begin(), used_filament_ids.end())); std::vector categories; - for (size_t i = 0; i < m_config.filament_category.values.size(); ++i) { - categories.push_back(m_config.filament_category.get_at(i)); + for (size_t i = 0; i < m_config.filament_adhesiveness_category.values.size(); ++i) { + categories.push_back(m_config.filament_adhesiveness_category.get_at(i)); } wipe_tower.set_filament_categories(categories); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index c4786ccf5..120ac92f5 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1773,8 +1773,8 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionPercents{ 100 }); - def = this->add("filament_category", coInts); - def->label = L("Category"); + def = this->add("filament_adhesiveness_category", coInts); + def->label = L("Adhesiveness Category"); def->tooltip = L("Filament category"); def->min = 0; def->mode = comDevelop; diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 9f8b31e99..ced3901d6 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1008,7 +1008,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBools, enable_pressure_advance)) ((ConfigOptionFloats, pressure_advance)) ((ConfigOptionFloats, filament_diameter)) - ((ConfigOptionInts, filament_category)) + ((ConfigOptionInts, filament_adhesiveness_category)) ((ConfigOptionFloats, filament_density)) ((ConfigOptionStrings, filament_type)) ((ConfigOptionBools, filament_soluble)) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 324c5456d..66d36ee7c 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3194,7 +3194,7 @@ void TabFilament::build() optgroup->append_single_option_line("required_nozzle_HRC"); optgroup->append_single_option_line("default_filament_colour"); optgroup->append_single_option_line("filament_diameter"); - optgroup->append_single_option_line("filament_category"); + optgroup->append_single_option_line("filament_adhesiveness_category"); optgroup->append_single_option_line("filament_flow_ratio", "", 0); optgroup->append_single_option_line("enable_pressure_advance"); optgroup->append_single_option_line("pressure_advance");