Merge pull request #212 from digitalbytes/process-multiple-files

Support skeining multiple files from the command line.
This commit is contained in:
Alessandro Ranellucci 2012-02-21 08:43:46 -08:00
commit 9ac92facdd
2 changed files with 14 additions and 16 deletions

View File

@ -23,6 +23,7 @@ sub go {
# skein the STL into layers # skein the STL into layers
# each layer has surfaces with holes # each layer has surfaces with holes
$self->status_cb->(5, "Processing input file " . $self->input_file);
$self->status_cb->(10, "Processing triangulated mesh"); $self->status_cb->(10, "Processing triangulated mesh");
my $print; my $print;
if ($self->input_file =~ /\.stl$/i) { if ($self->input_file =~ /\.stl$/i) {
@ -127,8 +128,8 @@ sub go {
$print->extrude_skirt; $print->extrude_skirt;
# output everything to a GCODE file # output everything to a GCODE file
$self->status_cb->(90, "Exporting GCODE");
my $output_file = $self->expanded_output_filepath; my $output_file = $self->expanded_output_filepath;
$self->status_cb->(90, "Exporting GCODE to $output_file");
$print->export_gcode($output_file); $print->export_gcode($output_file);
# run post-processing scripts # run post-processing scripts

View File

@ -71,21 +71,18 @@ if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
exit; exit;
} }
if ($ARGV[0]) { if (@ARGV) {
foreach my $input_file ( @ARGV ) {
# skein my $skein = Slic3r::Skein->new(
my $input_file = $ARGV[0]; input_file => $input_file,
output_file => $opt{output},
my $skein = Slic3r::Skein->new( status_cb => sub {
input_file => $input_file, my ($percent, $message) = @_;
output_file => $opt{output}, printf "=> $message\n";
status_cb => sub { },
my ($percent, $message) = @_; );
printf "=> $message\n"; $skein->go;
}, }
);
$skein->go;
} else { } else {
usage(1) unless $opt{save}; usage(1) unless $opt{save};
} }