3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into gui_translate_to_cpp

Browse source
This commit is contained in:
YuSanka 2018-01-14 21:58:21 +01:00
commit 8e0cd35c23
30 changed files with 2595 additions and 1460 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Slic3r/GUI/Plater.pm
View file

@ -434,6 +434,7 @@ sub new {
fil_mm3 => "Used Filament (mm^3)",
fil_g => "Used Filament (g)",
cost => "Cost",
time => "Estimated printing time",
);
while (my $field = shift @info) {
my $label = shift @info;
@ -1428,6 +1429,7 @@ sub on_export_completed {
$self->{"print_info_cost"}->SetLabel(sprintf("%.2f" , $self->{print}->total_cost));
$self->{"print_info_fil_g"}->SetLabel(sprintf("%.2f" , $self->{print}->total_weight));
$self->{"print_info_fil_mm3"}->SetLabel(sprintf("%.2f" , $self->{print}->total_extruded_volume));
$self->{"print_info_time"}->SetLabel($self->{print}->estimated_print_time);
$self->{"print_info_fil_m"}->SetLabel(sprintf("%.2f" , $self->{print}->total_used_filament / 1000));
$self->{"print_info_box_show"}->(1);

20
lib/Slic3r/GUI/Tab.pm
View file

@ -586,6 +586,15 @@ sub build {
my $optgroup = $page->new_optgroup('Vertical shells');
$optgroup->append_single_option_line('perimeters');
$optgroup->append_single_option_line('spiral_vase');
my $line = Slic3r::GUI::OptionsGroup::Line->new(
label => '',
full_width => 1,
widget => sub {
my ($parent) = @_;
return $self->{recommended_thin_wall_thickness_description_line} = Slic3r::GUI::OptionsGroup::StaticText->new($parent);
},
);
$optgroup->append_line($line);
}
{
my $optgroup = $page->new_optgroup('Horizontal shells');
@ -1055,9 +1064,20 @@ sub _update {
$self->get_field($_)->toggle($have_wipe_tower)
for qw(wipe_tower_x wipe_tower_y wipe_tower_width wipe_tower_per_color_wipe);
$self->{recommended_thin_wall_thickness_description_line}->SetText(
Slic3r::GUI::PresetHints::recommended_thin_wall_thickness(wxTheApp->{preset_bundle}));
$self->Thaw;
}
# Update on activation to recalculate the estimates if the nozzle diameter changed
# and the extrusion width values were left to zero (automatic, nozzle dependent).
sub OnActivate {
my ($self) = @_;
$self->{recommended_thin_wall_thickness_description_line}->SetText(
Slic3r::GUI::PresetHints::recommended_thin_wall_thickness(wxTheApp->{preset_bundle}));
}
package Slic3r::GUI::Tab::Filament;
use base 'Slic3r::GUI::Tab';
use Wx qw(wxTheApp);