diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-09-14 15:55:43 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-09-14 15:55:43 +0300 |
| commit | bd659663f868f03bc474792b656e72f1f67e8dbb (patch) | |
| tree | 7c745326912ee281cb9e0d91a9f2203482dee474 /lib/Slic3r/GUI | |
| parent | 578792be31d57eb084b39a1a04540946765264aa (diff) | |
| parent | 712fef0669a491c4335286d61d34ebb0b24345e6 (diff) | |
Merge remote-tracking branch 'origin/lm_wipe_tower_consumption'
Diffstat (limited to 'lib/Slic3r/GUI')
| -rw-r--r-- | lib/Slic3r/GUI/Plater.pm | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index e2c95859f..48b82237f 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -1655,20 +1655,37 @@ 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)") - => sprintf("%.2f" , $self->{print}->total_used_filament / 1000), + => $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")) : + 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), + => $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")) : + 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"; @@ -1683,6 +1700,7 @@ sub print_info_box_show { $scrolled_window_sizer->Show(2, $show); $scrolled_window_panel->Layout; + $self->Layout; } sub do_print { |