From 13377992f7f876de62b2ed3b524fa77667d0f419 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Sun, 9 Oct 2022 20:07:39 +0800 Subject: [PATCH] FIX: fix flushed filament Change-Id: I57965d0679d94da483f4ea3b1ada3600e7aa340a Signed-off-by: Stone Li --- src/libslic3r/Format/bbs_3mf.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp index 3a647eaba..3a7d35b72 100644 --- a/src/libslic3r/Format/bbs_3mf.cpp +++ b/src/libslic3r/Format/bbs_3mf.cpp @@ -456,10 +456,18 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result) for (auto it = ps.volumes_per_extruder.begin(); it != ps.volumes_per_extruder.end(); it++) { double volume = it->second; auto [used_filament_m, used_filament_g] = get_used_filament_from_volume(volume, it->first); + FilamentInfo info; - info.id = it->first; - info.used_m = used_filament_m; - info.used_g = used_filament_g; + info.id = it->first; + if (ps.flush_per_filament.find(it->first) != ps.flush_per_filament.end()) { + volume = ps.flush_per_filament.at(it->first); + auto [flushed_filament_m, flushed_filament_g] = get_used_filament_from_volume(volume, it->first); + info.used_m = used_filament_m + flushed_filament_m; + info.used_g = used_filament_g + flushed_filament_g; + } else { + info.used_m = used_filament_m; + info.used_g = used_filament_g; + } slice_filaments_info.push_back(info); }