3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 22:54:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Options on command line now override config. Also, "feed rate" was renamed to "speed" everywhere. #77

Browse source
This commit is contained in:
Alessandro Ranellucci 2011-12-01 22:03:13 +01:00
parent 2a02d26ca5
commit e99c9f9e5f
6 changed files with 120 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/Slic3r/Extruder.pm
View file

@ -16,25 +16,25 @@ has 'last_f' => (is => 'rw', default => sub {0});
has 'dec' => (is => 'ro', default => sub { 3 } );
# calculate speeds
has 'travel_feed_rate' => (
has 'travel_speed' => (
is => 'ro',
default => sub { $Slic3r::travel_feed_rate * 60 }, # mm/min
default => sub { $Slic3r::travel_speed * 60 }, # mm/min
);
has 'perimeter_feed_rate' => (
has 'perimeter_speed' => (
is => 'ro',
default => sub { $Slic3r::perimeter_feed_rate * 60 }, # mm/min
default => sub { $Slic3r::perimeter_speed * 60 }, # mm/min
);
has 'infill_feed_rate' => (
has 'infill_speed' => (
is => 'ro',
default => sub { $Slic3r::infill_feed_rate * 60 }, # mm/min
default => sub { $Slic3r::infill_speed * 60 }, # mm/min
);
has 'solid_infill_feed_rate' => (
has 'solid_infill_speed' => (
is => 'ro',
default => sub { $Slic3r::solid_infill_feed_rate * 60 }, # mm/min
default => sub { $Slic3r::solid_infill_speed * 60 }, # mm/min
);
has 'bridge_feed_rate' => (
has 'bridge_speed' => (
is => 'ro',
default => sub { $Slic3r::bridge_feed_rate * 60 }, # mm/min
default => sub { $Slic3r::bridge_speed * 60 }, # mm/min
);
has 'retract_speed' => (
is => 'ro',
@ -122,10 +122,10 @@ sub extrude {
# extrude arc or line
$self->print_feed_rate(
$path->role =~ /^(perimeter|skirt)$/o ? $self->perimeter_feed_rate
: $path->role eq 'fill' ? $self->infill_feed_rate
: $path->role eq 'solid-fill' ? $self->solid_infill_feed_rate
: $path->role eq 'bridge' ? $self->bridge_feed_rate
$path->role =~ /^(perimeter|skirt)$/o ? $self->perimeter_speed
: $path->role eq 'fill' ? $self->infill_speed
: $path->role eq 'solid-fill' ? $self->solid_infill_speed
: $path->role eq 'bridge' ? $self->bridge_speed
: die "Unknown role: " . $path->role
);
if ($path->isa('Slic3r::ExtrusionPath::Arc')) {
@ -268,7 +268,7 @@ sub _Gx {
: 1;
# determine speed
my $speed = ($e ? $self->print_feed_rate : $self->travel_feed_rate) * $speed_multiplier;
my $speed = ($e ? $self->print_feed_rate : $self->travel_speed) * $speed_multiplier;
# output speed if it's different from last one used
# (goal: reduce gcode size)