diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2018-09-12 10:28:26 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2018-09-12 10:28:26 +0300 |
| commit | 712fef0669a491c4335286d61d34ebb0b24345e6 (patch) | |
| tree | ec8dacb5c8459b470ff41917488e001cff4294b6 /lib/Slic3r/GUI | |
| parent | 961d8942187dcda70d87b358bceb6cf0a967a6b7 (diff) | |
Added number of toolchanges into 'Sliced info' statistics
Diffstat (limited to 'lib/Slic3r/GUI')
| -rw-r--r-- | lib/Slic3r/GUI/Plater.pm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 56c21bbbb..469fa42dd 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -1646,14 +1646,15 @@ sub print_info_box_show { $grid_sizer->AddGrowableCol(1, 1); $grid_sizer->AddGrowableCol(3, 1); $print_info_sizer->Add($grid_sizer, 0, wxEXPAND); + my $is_wipe_tower = $self->{print}->total_wipe_tower_filament > 0; my @info = ( L("Used Filament (m)") - => $self->{print}->total_wipe_tower_filament > 0 ? + => $is_wipe_tower ? 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")) : + L("wipe tower")) : sprintf("%.2f" , $self->{print}->total_used_filament / 1000), L("Used Filament (mm³)") @@ -1661,18 +1662,21 @@ sub print_info_box_show { L("Used Filament (g)"), => sprintf("%.2f" , $self->{print}->total_weight), L("Cost"), - => $self->{print}->total_wipe_tower_cost > 0 ? + => $is_wipe_tower ? 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")) : + 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)") => $self->{print}->estimated_silent_print_time ); + # if there is a wipe tower, insert number of toolchanges info into the array: + splice (@info, 8, 0, L("Number of tool changes") => sprintf("%.d", $self->{print}->m_wipe_tower_number_of_toolchanges)) if ($is_wipe_tower); + while ( my $label = shift @info) { my $value = shift @info; next if $value eq "N/A"; |