3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 20:51:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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
Download patch file Download diff file Expand all files Collapse all files

7
lib/Slic3r/Config.pm
View file

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

8
lib/Slic3r/Extruder.pm
View file

@ -183,9 +183,9 @@ sub extrude_path {
if ($Slic3r::cooling) {
my $path_time = unscale($path_length) / $self->speeds->{$self->last_speed} * 60;
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)
: unscale($path_length) / $Slic3r::bottom_layer_speed * 60;
: unscale($path_length) / $Slic3r::first_layer_speed * 60;
}
$self->elapsed_time($self->elapsed_time + $path_time);
}
@ -338,9 +338,9 @@ sub _Gx {
# apply the speed reduction for print moves on bottom layer
my $speed_f = $self->speeds->{$speed};
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)
: $Slic3r::bottom_layer_speed;
: $Slic3r::first_layer_speed;
}
$gcode .= sprintf " F%.${dec}f", $speed_f;
$self->last_speed($speed);

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

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