Renamed perimeter_offsets to perimeters

This commit is contained in:
Alessandro Ranellucci 2011-11-17 10:38:23 +01:00
parent 580f42c1de
commit c8ce989962
5 changed files with 9 additions and 8 deletions

View File

@ -62,7 +62,7 @@ our $thickness_ratio = 1;
our $flow_width; our $flow_width;
# print options # print options
our $perimeter_offsets = 3; our $perimeters = 3;
our $solid_layers = 3; our $solid_layers = 3;
our $bridge_overlap = 3; # mm our $bridge_overlap = 3; # mm
our $perimeter_infill_overlap_ratio = 0.15; # factor for flow width our $perimeter_infill_overlap_ratio = 0.15; # factor for flow width

View File

@ -78,9 +78,10 @@ our $Options = {
}, },
# print options # print options
'perimeter_offsets' => { 'perimeters' => {
label => 'Perimeters', label => 'Perimeters',
type => 'i', type => 'i',
aliases => [qw(perimeter_offsets)],
}, },
'solid_layers' => { 'solid_layers' => {
label => 'Solid layers', label => 'Solid layers',
@ -287,7 +288,7 @@ sub validate {
# --perimeters # --perimeters
die "Invalid value for --perimeters\n" die "Invalid value for --perimeters\n"
if $Slic3r::perimeter_offsets < 1; if $Slic3r::perimeters < 1;
# --solid-layers # --solid-layers
die "Invalid value for --solid-layers\n" die "Invalid value for --solid-layers\n"

View File

@ -33,7 +33,7 @@ sub new {
}, },
print => { print => {
title => 'Print settings', title => 'Print settings',
options => [qw(perimeter_offsets solid_layers fill_density fill_angle fill_pattern solid_fill_pattern)], options => [qw(perimeters solid_layers fill_density fill_angle fill_pattern solid_fill_pattern)],
}, },
retract => { retract => {
title => 'Retraction', title => 'Retraction',

View File

@ -12,7 +12,7 @@ sub make_perimeter {
# at least one perimeter is required # at least one perimeter is required
die "Can't slice object with no perimeters!\n" die "Can't slice object with no perimeters!\n"
if $Slic3r::perimeter_offsets == 0; if $Slic3r::perimeters == 0;
# this array will hold one arrayref per original surface; # this array will hold one arrayref per original surface;
# each item of this arrayref is an arrayref representing a depth (from inner # each item of this arrayref is an arrayref representing a depth (from inner
@ -40,7 +40,7 @@ sub make_perimeter {
# create other offsets # create other offsets
push @perimeters, []; push @perimeters, [];
for (my $loop = 0; $loop < $Slic3r::perimeter_offsets; $loop++) { for (my $loop = 0; $loop < $Slic3r::perimeters; $loop++) {
# offsetting a polygon can result in one or many offset polygons # offsetting a polygon can result in one or many offset polygons
@last_offsets = map $_->offset_ex(-$distance), @last_offsets; @last_offsets = map $_->offset_ex(-$distance), @last_offsets;
push @{ $perimeters[-1] }, [@last_offsets]; push @{ $perimeters[-1] }, [@last_offsets];

View File

@ -49,7 +49,7 @@ GetOptions(
'infill-every-layers=i' => \$Slic3r::infill_every_layers, 'infill-every-layers=i' => \$Slic3r::infill_every_layers,
# print options # print options
'perimeters=i' => \$Slic3r::perimeter_offsets, 'perimeters=i' => \$Slic3r::perimeters,
'solid-layers=i' => \$Slic3r::solid_layers, 'solid-layers=i' => \$Slic3r::solid_layers,
'fill-pattern=s' => \$Slic3r::fill_pattern, 'fill-pattern=s' => \$Slic3r::fill_pattern,
'solid-fill-pattern=s' => \$Slic3r::solid_fill_pattern, 'solid-fill-pattern=s' => \$Slic3r::solid_fill_pattern,
@ -168,7 +168,7 @@ Usage: slic3r.pl [ OPTIONS ] file.stl
Print options: Print options:
--perimeters Number of perimeters/horizontal skins (range: 1+, --perimeters Number of perimeters/horizontal skins (range: 1+,
default: $Slic3r::perimeter_offsets) default: $Slic3r::perimeters)
--solid-layers Number of solid layers to do for top/bottom surfaces --solid-layers Number of solid layers to do for top/bottom surfaces
(range: 1+, default: $Slic3r::solid_layers) (range: 1+, default: $Slic3r::solid_layers)
--fill-density Infill density (range: 0-1, default: $Slic3r::fill_density) --fill-density Infill density (range: 0-1, default: $Slic3r::fill_density)