Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators

This commit is contained in:
Enrico Turri 2018-07-19 15:09:42 +02:00
commit c40258d9b2

View File

@ -1605,17 +1605,17 @@ sub print_info_box_show {
$print_info_sizer->Add($grid_sizer, 0, wxEXPAND); $print_info_sizer->Add($grid_sizer, 0, wxEXPAND);
my @info = ( my @info = (
L("Used Filament (m)") L("Used Filament (m)")
=> sprintf("%.2f" , $self->{print}->total_cost), => sprintf("%.2f" , $self->{print}->total_used_filament / 1000),
L("Used Filament (mm³)") L("Used Filament (mm³)")
=> sprintf("%.2f" , $self->{print}->total_weight),
L("Used Filament (g)"),
=> sprintf("%.2f" , $self->{print}->total_extruded_volume), => sprintf("%.2f" , $self->{print}->total_extruded_volume),
L("Used Filament (g)"),
=> sprintf("%.2f" , $self->{print}->total_weight),
L("Cost"), L("Cost"),
=> $self->{print}->estimated_normal_print_time, => sprintf("%.2f" , $self->{print}->total_cost),
L("Estimated printing time (normal mode)") L("Estimated printing time (normal mode)")
=> $self->{print}->estimated_silent_print_time, => $self->{print}->estimated_normal_print_time,
L("Estimated printing time (silent mode)") L("Estimated printing time (silent mode)")
=> sprintf("%.2f" , $self->{print}->total_used_filament / 1000) => $self->{print}->estimated_silent_print_time
); );
while ( my $label = shift @info) { while ( my $label = shift @info) {
my $value = shift @info; my $value = shift @info;