juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: refine match mode group result

Browse Source 
1.When there are identical materials, try to make the quantity of
materials for each nozzle as similar as possible after grouping.
2.Fix an encoding error

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iad77d7a995b9c25d004026f409c7e2ecbb8269db
(cherry picked from commit 13d7cd06252678b6b084d17438e99ff808a4191d)
(cherry picked from commit 3cd587d09e066d6c6a27d466b7f663dfd5d674f3)
This commit is contained in:
xun.zhang
2024-12-26 11:07:22 +08:00
committed by Noisyfox
parent da0e624bd0
commit 439761f71e
3 changed files with 159 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/libslic3r/FilamentGroupUtils.cpp
View File

@@ -26,6 +26,32 @@ namespace FilamentGroupUtils
a = hexToByte(hexstr.substr(7, 2));
}
bool Color::operator<(const Color& other) const
{
if (r != other.r) return r < other.r;
if (g != other.g) return g < other.g;
if (b != other.b) return b < other.b;
return a < other.a;
}
bool Color::operator==(const Color& other) const
{
return r == other.r && g == other.g && b == other.b && a == other.a;
}
bool Color::operator!=(const Color& other) const
{
return r != other.r || g != other.g || b != other.b || a != other.a;
}
bool FilamentInfo::operator<(const FilamentInfo& other) const
{
if (color != other.color) return color < other.color;
return type < other.type;
}
// TODO: add explanation
std::vector<int> calc_max_group_size(const std::vector<std::map<int, int>>& ams_counts, bool ignore_ext_filament) {
// add default value to 2
@@ -53,7 +79,11 @@ namespace FilamentGroupUtils
auto& arr = filament_configs[idx];
for (auto& item : arr) {
FilamentInfo temp;
temp.color = Color(item.option<ConfigOptionStrings>("filament_colour")->get_at(0));
std::string color_str = item.option<ConfigOptionStrings>("filament_colour")->get_at(0);
if (color_str.empty())
temp.color = Color();
else
temp.color = Color(color_str);
temp.type = item.option<ConfigOptionStrings>("filament_type")->get_at(0);
temp.extruder_id = idx;
temp.is_extended = item.option<ConfigOptionStrings>("tray_name")->get_at(0) == "Ext"; // hard-coded ext flag