juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 19:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: some filament group issues

Browse Source 
1. Add filament_is_support field. Format the filament type
2. Optimize machine filament info logic

jira:STUDIO-10326

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia8bfc37095339e73c98209b4e3f1e0804e511e88
(cherry picked from commit 001144400b841629439a890d46fa40a7296689ba)
This commit is contained in:
xun.zhang
2025-09-16 23:27:32 +08:00
committed by Noisyfox
parent 2db3c63b7b
commit 58c877976d
8 changed files with 142 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/FilamentGroup.hpp
+4 -6
View File
@@ -72,8 +72,7 @@ namespace Slic3r
struct ModelInfo {
std::vector<FlushMatrix> flush_matrix;
std::vector<std::vector<unsigned int>> layer_filaments;
std::vector<std::string> filament_colors;
std::vector<std::string> filament_types;
std::vector<FilamentGroupUtils::FilamentInfo> filament_info;
std::vector<std::set<int>> unprintable_filaments;
} model_info;
@@ -87,7 +86,7 @@ namespace Slic3r
struct MachineInfo {
std::vector<int> max_group_size;
std::vector<std::vector<FilamentGroupUtils::FilamentInfo>> machine_filament_info;
std::vector<std::vector<FilamentGroupUtils::MachineFilamentInfo>> machine_filament_info;
std::vector<std::pair<std::set<int>, int>> extruder_group_size;
int master_extruder_id;
} machine_info;
@@ -95,9 +94,8 @@ namespace Slic3r
std::vector<int> select_best_group_for_ams(const std::vector<std::vector<int>>& map_lists,
const std::vector<unsigned int>& used_filaments,
const std::vector<FilamentGroupUtils::Color>& used_filament_colors,
const std::vector<std::string>& used_filament_types,
const std::vector<std::vector<FilamentGroupUtils::FilamentInfo>>& machine_filament_info,
const std::vector<FilamentGroupUtils::FilamentInfo>& used_filament_info,
const std::vector<std::vector<FilamentGroupUtils::MachineFilamentInfo>>& machine_filament_info,
const double color_delta_threshold = 20);
std::vector<int> optimize_group_for_master_extruder(const std::vector<unsigned int>& used_filaments, const FilamentGroupContext& ctx, const std::vector<int>& filament_map);