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

Merge branch 'triffid-duplicate'

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-04-09 15:14:40 +02:00
commit 82a16ed8ee
7 changed files with 146 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/Slic3r/Config.pm
View file

@ -10,7 +10,7 @@ our $Options = {
# miscellaneous options
'notes' => {
label => 'Configuration notes',
cli => 'notes=s',
cli => 'notes=s',
type => 's',
multiline => 1,
width => 350,
@ -392,6 +392,11 @@ our $Options = {
cli => 'rotate=i',
type => 'i',
},
'duplicate' => {
label => 'Copies (auto arrange)',
cli => 'duplicate=i',
type => 'i',
},
'duplicate_x' => {
label => 'Copies along X',
cli => 'duplicate-x=i',
@ -599,6 +604,10 @@ sub validate {
die "Invalid value for --scale\n"
if $Slic3r::scale <= 0;
# --duplicate
die "Invalid value for --duplicate\n"
if $Slic3r::duplicate < 1;
# --duplicate-x
die "Invalid value for --duplicate-x\n"
if $Slic3r::duplicate_x < 1;
@ -606,6 +615,11 @@ sub validate {
# --duplicate-y
die "Invalid value for --duplicate-y\n"
if $Slic3r::duplicate_y < 1;
# reflect actual quantity in 'duplicate' setting for use with output-filename-format, ie both --duplicate 15 and --duplicate-x 3 --duplicate-y 5 will make an appropriate filename
if ($Slic3r::duplicate == 1 && (($Slic3r::duplicate_x > 1) || ($Slic3r::duplicate_y > 1))) {
$Slic3r::duplicate = $Slic3r::duplicate_x * $Slic3r::duplicate_y;
}
# --duplicate-distance
die "Invalid value for --duplicate-distance\n"
@ -619,8 +633,8 @@ sub validate {
die "Invalid value for --bridge-flow-ratio\n"
if $Slic3r::bridge_flow_ratio <= 0;
$Slic3r::first_layer_temperature //= $Slic3r::temperature; #/
$Slic3r::first_layer_bed_temperature //= $Slic3r::bed_temperature; #/
$Slic3r::first_layer_temperature //= $Slic3r::temperature; #/
$Slic3r::first_layer_bed_temperature //= $Slic3r::bed_temperature; #/
# G-code flavors
$Slic3r::extrusion_axis = 'A' if $Slic3r::gcode_flavor eq 'mach3';