GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-06 00:06:03 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: fix flushed filament

Browse Source 
Change-Id: I57965d0679d94da483f4ea3b1ada3600e7aa340a
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-10-09 20:07:39 +08:00 committed by Lane.Wei
parent 464957864c
commit 13377992f7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libslic3r/Format/bbs_3mf.cpp
View File

@ -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);
}