diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2018-09-05 16:35:35 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2018-09-05 16:35:35 +0300 |
| commit | c83a5474f6f10832c98a56fe8c9717803041809d (patch) | |
| tree | 70301346242b2d212c750c9637dffc8a401377fe /lib/Slic3r/GUI | |
| parent | 22569de00fb05d3e69695d1a07819b795bbde134 (diff) | |
Wipe tower extrusions are now accounted for in the filament consumption statistics
Diffstat (limited to 'lib/Slic3r/GUI')
| -rw-r--r-- | lib/Slic3r/GUI/Plater.pm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index ee2689d16..7c9e9899e 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -1648,13 +1648,26 @@ sub print_info_box_show { $print_info_sizer->Add($grid_sizer, 0, wxEXPAND); my @info = ( L("Used Filament (m)") - => sprintf("%.2f" , $self->{print}->total_used_filament / 1000), + => $self->{print}->total_wipe_tower_filament > 0 ? + sprintf("%.2f (%.2f %s + %.2f %s)" , $self->{print}->total_used_filament / 1000, + ($self->{print}->total_used_filament - $self->{print}->total_wipe_tower_filament) / 1000, + L("objects"), + $self->{print}->total_wipe_tower_filament / 1000, + L("wipe_tower")) : + sprintf("%.2f" , $self->{print}->total_used_filament / 1000), + L("Used Filament (mm³)") => sprintf("%.2f" , $self->{print}->total_extruded_volume), L("Used Filament (g)"), => sprintf("%.2f" , $self->{print}->total_weight), L("Cost"), - => sprintf("%.2f" , $self->{print}->total_cost), + => $self->{print}->total_wipe_tower_cost > 0 ? + sprintf("%.2f (%.2f %s + %.2f %s)" , $self->{print}->total_cost, + ($self->{print}->total_cost - $self->{print}->total_wipe_tower_cost), + L("objects"), + $self->{print}->total_wipe_tower_cost, + L("wipe_tower")) : + sprintf("%.2f" , $self->{print}->total_cost), L("Estimated printing time (normal mode)") => $self->{print}->estimated_normal_print_time, L("Estimated printing time (silent mode)") |