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

Renamed bottom_layer_speed to first_layer_speed for consistency

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-06-06 15:52:21 +02:00
parent 4a188f8566
commit 896c7e952e
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.markdown
View File

@ -131,7 +131,7 @@ The author is Alessandro Ranellucci.
--infill-speed Speed of print moves in mm/s (default: 60) --infill-speed Speed of print moves in mm/s (default: 60)
--solid-infill-speed Speed of print moves for solid surfaces in mm/s (default: 60) --solid-infill-speed Speed of print moves for solid surfaces in mm/s (default: 60)
--bridge-speed Speed of bridge print moves in mm/s (default: 60) --bridge-speed Speed of bridge print moves in mm/s (default: 60)
--bottom-layer-speed Speed of print moves for bottom layer, expressed either as an absolute --first-layer-speed Speed of print moves for bottom layer, expressed either as an absolute
value or as a percentage over normal speeds (default: 30%) value or as a percentage over normal speeds (default: 30%)
Accuracy options: Accuracy options:

2
lib/Slic3r.pm
View File

@ -83,7 +83,7 @@ our $small_perimeter_speed = 30; # mm/s
our $infill_speed = 60; # mm/s our $infill_speed = 60; # mm/s
our $solid_infill_speed = 60; # mm/s our $solid_infill_speed = 60; # mm/s
our $bridge_speed = 60; # mm/s our $bridge_speed = 60; # mm/s
our $bottom_layer_speed = '30%'; # mm/s or % our $first_layer_speed = '30%'; # mm/s or %
# acceleration options # acceleration options
our $acceleration = 0; our $acceleration = 0;

7
lib/Slic3r/Config.pm
View File

@ -157,9 +157,9 @@ our $Options = {
type => 'f', type => 'f',
aliases => [qw(bridge_feed_rate)], aliases => [qw(bridge_feed_rate)],
}, },
'bottom_layer_speed' => { 'first_layer_speed' => {
label => 'Bottom layer speed (mm/s or %)', label => 'First layer speed (mm/s or %)',
cli => 'bottom-layer-speed=f', cli => 'first-layer-speed=f',
type => 'f', type => 'f',
}, },
@ -522,6 +522,7 @@ sub load {
next if $ignore{$key}; next if $ignore{$key};
if ($key =~ /^(?:extrusion_width|bottom_layer_speed)_ratio$/) { if ($key =~ /^(?:extrusion_width|bottom_layer_speed)_ratio$/) {
$key = $1; $key = $1;
$key =~ s/^bottom_layer_speed$/first_layer_speed/;
$val = $val =~ /^\d+(\.\d+)?$/ ? ($val*100) . "%" : 0; $val = $val =~ /^\d+(\.\d+)?$/ ? ($val*100) . "%" : 0;
} }

8
lib/Slic3r/Extruder.pm
View File

@ -183,9 +183,9 @@ sub extrude_path {
if ($Slic3r::cooling) { if ($Slic3r::cooling) {
my $path_time = unscale($path_length) / $self->speeds->{$self->last_speed} * 60; my $path_time = unscale($path_length) / $self->speeds->{$self->last_speed} * 60;
if ($self->layer->id == 0) { if ($self->layer->id == 0) {
$path_time = $Slic3r::bottom_layer_speed =~ /^(\d+(?:\.\d+)?)%$/ $path_time = $Slic3r::first_layer_speed =~ /^(\d+(?:\.\d+)?)%$/
? $path_time / ($1/100) ? $path_time / ($1/100)
: unscale($path_length) / $Slic3r::bottom_layer_speed * 60; : unscale($path_length) / $Slic3r::first_layer_speed * 60;
} }
$self->elapsed_time($self->elapsed_time + $path_time); $self->elapsed_time($self->elapsed_time + $path_time);
} }
@ -338,9 +338,9 @@ sub _Gx {
# apply the speed reduction for print moves on bottom layer # apply the speed reduction for print moves on bottom layer
my $speed_f = $self->speeds->{$speed}; my $speed_f = $self->speeds->{$speed};
if ($e && $self->layer->id == 0 && $comment !~ /retract/) { if ($e && $self->layer->id == 0 && $comment !~ /retract/) {
$speed_f = $Slic3r::bottom_layer_speed =~ /^(\d+(?:\.\d+)?)%$/ $speed_f = $Slic3r::first_layer_speed =~ /^(\d+(?:\.\d+)?)%$/
? ($speed_f * $1/100) ? ($speed_f * $1/100)
: $Slic3r::bottom_layer_speed; : $Slic3r::first_layer_speed;
} }
$gcode .= sprintf " F%.${dec}f", $speed_f; $gcode .= sprintf " F%.${dec}f", $speed_f;
$self->last_speed($speed); $self->last_speed($speed);

2
lib/Slic3r/GUI/SkeinPanel.pm
View File

@ -36,7 +36,7 @@ sub new {
}, },
speed => { speed => {
title => 'Other speed settings', title => 'Other speed settings',
options => [qw(travel_speed bottom_layer_speed)], options => [qw(travel_speed first_layer_speed)],
}, },
accuracy => { accuracy => {
title => 'Accuracy', title => 'Accuracy',

4
slic3r.pl
View File

@ -175,8 +175,8 @@ $j
--infill-speed Speed of print moves in mm/s (default: $Slic3r::infill_speed) --infill-speed Speed of print moves in mm/s (default: $Slic3r::infill_speed)
--solid-infill-speed Speed of print moves for solid surfaces in mm/s (default: $Slic3r::solid_infill_speed) --solid-infill-speed Speed of print moves for solid surfaces in mm/s (default: $Slic3r::solid_infill_speed)
--bridge-speed Speed of bridge print moves in mm/s (default: $Slic3r::bridge_speed) --bridge-speed Speed of bridge print moves in mm/s (default: $Slic3r::bridge_speed)
--bottom-layer-speed Speed of print moves for bottom layer, expressed either as an absolute --first-layer-speed Speed of print moves for bottom layer, expressed either as an absolute
value or as a percentage over normal speeds (default: $Slic3r::bottom_layer_speed) value or as a percentage over normal speeds (default: $Slic3r::first_layer_speed)
Accuracy options: Accuracy options:
--layer-height Layer height in mm (default: $Slic3r::layer_height) --layer-height Layer height in mm (default: $Slic3r::layer_height)