mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: enhance accuracy of weight calculation 

1.Use float to store the weight copmputed in the procedure.Avoid the
issue where filament weight remains at 0 after changing filaments

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iff0cfc6e22f34affbc232dbfe196f27ee06d2d9e
This commit is contained in:
xun.zhang 2024-09-18 14:10:41 +08:00 committed by lane.wei
parent 0e848f4fba
commit 994e4f4840
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/GCode/ToolOrdering.cpp
View File

@ -143,14 +143,14 @@ static double calc_max_layer_height(const PrintConfig &config, double max_object
} }
//calculate the flush weight (first value) and filament change count(second value) //calculate the flush weight (first value) and filament change count(second value)
static FilamentChangeStats calc_filament_change_info_by_toolorder(const PrintConfig* config,const std::vector<int>&filament_map,const std::vector<FlushMatrix>&flush_matrix,const std::vector<std::vector<unsigned int>>&layer_sequences) static FilamentChangeStats calc_filament_change_info_by_toolorder(const PrintConfig* config, const std::vector<int>& filament_map, const std::vector<FlushMatrix>& flush_matrix, const std::vector<std::vector<unsigned int>>& layer_sequences)
{ {
FilamentChangeStats ret; FilamentChangeStats ret;
std::map<int, int> flush_volume_per_filament; std::unordered_map<int, int> flush_volume_per_filament;
std::vector<unsigned int>last_filament_per_extruder(2, -1); std::vector<unsigned int>last_filament_per_extruder(2, -1);
int total_filament_change_count = 0; int total_filament_change_count = 0;
int total_filament_flush_weight = 0; float total_filament_flush_weight = 0;
for (const auto& ls : layer_sequences) { for (const auto& ls : layer_sequences) {
for (const auto& item : ls) { for (const auto& item : ls) {
int extruder_id = filament_map[item]; int extruder_id = filament_map[item];
@ -165,12 +165,12 @@ static FilamentChangeStats calc_filament_change_info_by_toolorder(const PrintCon
} }
for (auto& fv : flush_volume_per_filament) { for (auto& fv : flush_volume_per_filament) {
int weight = config->filament_density.get_at(fv.first) * 0.001 * fv.second; float weight = config->filament_density.get_at(fv.first) * 0.001 * fv.second;
total_filament_flush_weight += weight; total_filament_flush_weight += weight;
} }
ret.filament_change_count = total_filament_change_count; ret.filament_change_count = total_filament_change_count;
ret.filament_flush_weight = total_filament_flush_weight; ret.filament_flush_weight = (int)total_filament_flush_weight;
return ret; return ret;
} }