Merge branch 'per-extruder-retraction-settings'

Conflicts:
	lib/Slic3r/Config.pm
	lib/Slic3r/GUI/Tab.pm
This commit is contained in:
Alessandro Ranellucci 2012-08-08 22:06:47 +02:00
commit 9ca21c835c
5 changed files with 68 additions and 47 deletions

View file

@ -6,10 +6,12 @@ use Slic3r::Geometry qw(PI);
use constant OPTIONS => [qw(
extruder_offset
nozzle_diameter filament_diameter extrusion_multiplier temperature first_layer_temperature
retract_length retract_lift retract_speed retract_restart_extra retract_before_travel
)];
has $_ => (is => 'ro', required => 1) for @{&OPTIONS};
has 'e_per_mm3' => (is => 'lazy');
has 'retract_speed_mm_min' => (is => 'lazy');
has '_mm3_per_mm_cache' => (is => 'ro', default => sub {{}});
sub _build_e_per_mm3 {
@ -17,6 +19,11 @@ sub _build_e_per_mm3 {
return $self->extrusion_multiplier * (4 / (($self->filament_diameter ** 2) * PI));
}
sub _build_retract_speed_mm_min {
my $self = shift;
return $self->retract_speed * 60;
}
sub make_flow {
my $self = shift;
return Slic3r::Flow->new(nozzle_diameter => $self->nozzle_diameter, @_);