mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-05 21:14:01 -06:00
Options on command line now override config. Also, "feed rate" was renamed to "speed" everywhere. #77
This commit is contained in:
Alessandro Ranellucci
parent
2a02d26ca5
commit
e99c9f9e5f
6 changed files with 120 additions and 112 deletions
|
|
@ -10,119 +10,158 @@ our $Options = {
|
|||
# printer options
|
||||
'nozzle_diameter' => {
|
||||
label => 'Nozzle diameter',
|
||||
cli => 'nozzle-diameter=f',
|
||||
type => 'f',
|
||||
},
|
||||
'print_center' => {
|
||||
label => 'Print center',
|
||||
cli => 'print-center=s',
|
||||
type => 'point',
|
||||
serialize => sub { join ',', @{$_[0]} },
|
||||
deserialize => sub { [ split /,/, $_[0] ] },
|
||||
},
|
||||
'use_relative_e_distances' => {
|
||||
label => 'Use relative E distances',
|
||||
cli => 'use-relative-e-distances',
|
||||
type => 'bool',
|
||||
},
|
||||
'no_extrusion' => {
|
||||
label => 'No extrusion',
|
||||
cli => 'no-extrusion',
|
||||
type => 'bool',
|
||||
},
|
||||
'z_offset' => {
|
||||
label => 'Z offset',
|
||||
cli => 'z-offset=f',
|
||||
type => 'f',
|
||||
},
|
||||
'gcode_arcs' => {
|
||||
label => 'Use native GCODE arcs',
|
||||
cli => 'gcode-arcs',
|
||||
type => 'bool',
|
||||
},
|
||||
'g0' => {
|
||||
label => 'Use g0 for travel moves',
|
||||
cli => 'g0',
|
||||
type => 'bool',
|
||||
},
|
||||
|
||||
# filament options
|
||||
'filament_diameter' => {
|
||||
label => 'Diameter (mm)',
|
||||
cli => 'filament-diameter=f',
|
||||
type => 'f',
|
||||
},
|
||||
'extrusion_multiplier' => {
|
||||
label => 'Extrusion multiplier',
|
||||
cli => 'extrusion-multiplier=f',
|
||||
type => 'f',
|
||||
aliases => [qw(filament_packing_density)],
|
||||
},
|
||||
'temperature' => {
|
||||
label => 'Temperature (°C)',
|
||||
cli => 'temperature=i',
|
||||
type => 'i',
|
||||
},
|
||||
|
||||
# speed options
|
||||
'travel_feed_rate' => {
|
||||
'travel_speed' => {
|
||||
label => 'Travel (mm/s)',
|
||||
cli => 'travel-speed=i',
|
||||
type => 'f',
|
||||
aliases => [qw(travel_feed_rate)],
|
||||
},
|
||||
'perimeter_feed_rate' => {
|
||||
'perimeter_speed' => {
|
||||
label => 'Perimeters (mm/s)',
|
||||
cli => 'perimeter-speed=i',
|
||||
type => 'f',
|
||||
aliases => [qw(perimeter_feed_rate)],
|
||||
},
|
||||
'infill_feed_rate' => {
|
||||
'infill_speed' => {
|
||||
label => 'Infill (mm/s)',
|
||||
cli => 'infill-speed=i',
|
||||
type => 'f',
|
||||
aliases => [qw(print_feed_rate)],
|
||||
aliases => [qw(print_feed_rate infill_feed_rate)],
|
||||
},
|
||||
'solid_infill_feed_rate' => {
|
||||
'solid_infill_speed' => {
|
||||
label => 'Solid infill (mm/s)',
|
||||
cli => 'solid-infill-speed=i',
|
||||
type => 'f',
|
||||
aliases => [qw(solid_infill_feed_rate)],
|
||||
},
|
||||
'bridge_feed_rate' => {
|
||||
'bridge_speed' => {
|
||||
label => 'Bridges (mm/s)',
|
||||
cli => 'bridge-speed=i',
|
||||
type => 'f',
|
||||
aliases => [qw(bridge_feed_rate)],
|
||||
},
|
||||
'bottom_layer_speed_ratio' => {
|
||||
label => 'Bottom layer speed ratio',
|
||||
cli => 'bottom-layer-speed-ratio=f',
|
||||
type => 'f',
|
||||
},
|
||||
|
||||
# accuracy options
|
||||
'layer_height' => {
|
||||
label => 'Layer height (mm)',
|
||||
cli => 'layer-height=f',
|
||||
type => 'f',
|
||||
},
|
||||
'extrusion_width_ratio' => {
|
||||
label => 'Extrusion width (ratio over layer height; leave zero to calculate automatically)',
|
||||
cli => 'extrusion-width-ratio=f',
|
||||
type => 'f',
|
||||
},
|
||||
'first_layer_height_ratio' => {
|
||||
label => 'First layer height ratio',
|
||||
cli => 'first-layer-height-ratio=f',
|
||||
type => 'f',
|
||||
},
|
||||
'infill_every_layers' => {
|
||||
label => 'Infill every N layers',
|
||||
cli => 'infill-every-layers=i',
|
||||
type => 'i',
|
||||
},
|
||||
|
||||
# print options
|
||||
'perimeters' => {
|
||||
label => 'Perimeters',
|
||||
cli => 'perimeters=i',
|
||||
type => 'i',
|
||||
aliases => [qw(perimeter_offsets)],
|
||||
},
|
||||
'solid_layers' => {
|
||||
label => 'Solid layers',
|
||||
cli => 'solid-layers=i',
|
||||
type => 'i',
|
||||
},
|
||||
'fill_pattern' => {
|
||||
label => 'Fill pattern',
|
||||
cli => 'fill-pattern=s',
|
||||
type => 'select',
|
||||
values => [qw(rectilinear line concentric hilbertcurve archimedeanchords octagramspiral)],
|
||||
labels => [qw(rectilinear line concentric), 'hilbertcurve (slow)', 'archimedeanchords (slow)', 'octagramspiral (slow)'],
|
||||
},
|
||||
'solid_fill_pattern' => {
|
||||
label => 'Solid fill pattern',
|
||||
cli => 'solid-fill-pattern=s',
|
||||
type => 'select',
|
||||
values => [qw(rectilinear concentric hilbertcurve archimedeanchords octagramspiral)],
|
||||
labels => [qw(rectilinear concentric), 'hilbertcurve (slow)', 'archimedeanchords (slow)', 'octagramspiral (slow)'],
|
||||
},
|
||||
'fill_density' => {
|
||||
label => 'Fill density',
|
||||
cli => 'fill-density=f',
|
||||
type => 'f',
|
||||
},
|
||||
'fill_angle' => {
|
||||
label => 'Fill angle (°)',
|
||||
cli => 'fill-angle=i',
|
||||
type => 'i',
|
||||
},
|
||||
'start_gcode' => {
|
||||
label => 'Start GCODE',
|
||||
cli => 'start-gcode=s',
|
||||
type => 's',
|
||||
multiline => 1,
|
||||
width => 350,
|
||||
|
|
@ -132,6 +171,7 @@ our $Options = {
|
|||
},
|
||||
'end_gcode' => {
|
||||
label => 'End GCODE',
|
||||
cli => 'end-gcode=s',
|
||||
type => 's',
|
||||
multiline => 1,
|
||||
width => 350,
|
||||
|
|
@ -143,60 +183,73 @@ our $Options = {
|
|||
# retraction options
|
||||
'retract_length' => {
|
||||
label => 'Length (mm)',
|
||||
cli => 'retract-length=f',
|
||||
type => 'f',
|
||||
},
|
||||
'retract_speed' => {
|
||||
label => 'Speed (mm/s)',
|
||||
cli => 'retract-speed=i',
|
||||
type => 'i',
|
||||
},
|
||||
'retract_restart_extra' => {
|
||||
label => 'Extra length on restart (mm)',
|
||||
cli => 'retract-restart-extra=f',
|
||||
type => 'f',
|
||||
},
|
||||
'retract_before_travel' => {
|
||||
label => 'Minimum travel after retraction (mm)',
|
||||
cli => 'retract-before-travel=f',
|
||||
type => 'f',
|
||||
},
|
||||
'retract_lift' => {
|
||||
label => 'Lift Z (mm)',
|
||||
cli => 'retract-lift=f',
|
||||
type => 'f',
|
||||
},
|
||||
|
||||
# skirt options
|
||||
'skirts' => {
|
||||
label => 'Loops',
|
||||
cli => 'skirts=i',
|
||||
type => 'i',
|
||||
},
|
||||
'skirt_distance' => {
|
||||
label => 'Distance from object (mm)',
|
||||
cli => 'skirt-distance=i',
|
||||
type => 'i',
|
||||
},
|
||||
'skirt_height' => {
|
||||
label => 'Skirt height (layers)',
|
||||
cli => 'skirt-height=i',
|
||||
type => 'i',
|
||||
},
|
||||
|
||||
# transform options
|
||||
'scale' => {
|
||||
label => 'Scale',
|
||||
cli => 'scale=f',
|
||||
type => 'f',
|
||||
},
|
||||
'rotate' => {
|
||||
label => 'Rotate (°)',
|
||||
cli => 'rotate=i',
|
||||
type => 'i',
|
||||
},
|
||||
'duplicate_x' => {
|
||||
label => 'Copies along X',
|
||||
cli => 'duplicate-x=i',
|
||||
type => 'i',
|
||||
aliases => [qw(multiply_x)],
|
||||
},
|
||||
'duplicate_y' => {
|
||||
label => 'Copies along Y',
|
||||
cli => 'duplicate-y=i',
|
||||
type => 'i',
|
||||
aliases => [qw(multiply_y)],
|
||||
},
|
||||
'duplicate_distance' => {
|
||||
label => 'Distance between copies',
|
||||
cli => 'duplicate-distance=i',
|
||||
type => 'i',
|
||||
aliases => [qw(multiply_distance)],
|
||||
},
|
||||
|
|
@ -260,7 +313,7 @@ sub validate_cli {
|
|||
die "Invalid value for --${_}-gcode: file does not exist"
|
||||
if !-e $opt->{$_."_gcode"};
|
||||
open my $fh, "<", $opt->{$_."_gcode"};
|
||||
set($_."_gcode", do { local $/; <$fh> });
|
||||
$opt->{$_."_gcode"} = do { local $/; <$fh> };
|
||||
close $fh;
|
||||
}
|
||||
}
|
||||
|
|
@ -361,8 +414,8 @@ sub validate {
|
|||
if $Slic3r::skirt_height < 1;
|
||||
|
||||
# legacy with existing config files
|
||||
$Slic3r::bridge_feed_rate ||= $Slic3r::infill_feed_rate;
|
||||
$Slic3r::solid_infill_feed_rate ||= $Slic3r::infill_feed_rate;
|
||||
$Slic3r::bridge_speed ||= $Slic3r::infill_speed;
|
||||
$Slic3r::solid_infill_speed ||= $Slic3r::infill_speed;
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ sub new {
|
|||
},
|
||||
print_speed => {
|
||||
title => 'Print speed',
|
||||
options => [qw(perimeter_feed_rate infill_feed_rate solid_infill_feed_rate bridge_feed_rate)],
|
||||
options => [qw(perimeter_speed infill_speed solid_infill_speed bridge_speed)],
|
||||
},
|
||||
speed => {
|
||||
title => 'Other speed settings',
|
||||
options => [qw(travel_feed_rate bottom_layer_speed_ratio)],
|
||||
options => [qw(travel_speed bottom_layer_speed_ratio)],
|
||||
},
|
||||
accuracy => {
|
||||
title => 'Accuracy',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue