3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed regression causing [input_filename] and [input_filename_base] not being available in custom G-code anymore. Includes regression test. #1507

Browse Source
This commit is contained in:
Alessandro Ranellucci 2015-02-15 23:41:36 +01:00
parent c0f453f83e
commit a07c48bb30
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Slic3r/Print.pm
View File

@ -428,10 +428,10 @@ sub expanded_output_filepath {
my $filename = my $filename_base = basename($input_file); my $filename = my $filename_base = basename($input_file);
$filename_base =~ s/\.[^.]+$//; # without suffix $filename_base =~ s/\.[^.]+$//; # without suffix
my $extra = {
input_filename => $filename, # set filename in placeholder parser so that it's available also in custom G-code
input_filename_base => $filename_base, $self->placeholder_parser->set(input_filename => $filename);
}; $self->placeholder_parser->set(input_filename_base => $filename_base);
if ($path && -d $path) { if ($path && -d $path) {
# if output path is an existing directory, we take that and append # if output path is an existing directory, we take that and append
@ -447,7 +447,7 @@ sub expanded_output_filepath {
# make sure we use an up-to-date timestamp # make sure we use an up-to-date timestamp
$self->placeholder_parser->update_timestamp; $self->placeholder_parser->update_timestamp;
return $self->placeholder_parser->process($path, $extra); return $self->placeholder_parser->process($path);
} }
# This method assigns extruders to the volumes having a material # This method assigns extruders to the volumes having a material

10
t/gcode.t
View File

@ -1,4 +1,4 @@
use Test::More tests => 20; use Test::More tests => 21;
use strict; use strict;
use warnings; use warnings;
@ -184,4 +184,12 @@ use Slic3r::Test;
} }
} }
{
my $config = Slic3r::Config->new_from_defaults;
$config->set('start_gcode', 'START:[input_filename]');
my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
my $gcode = Slic3r::Test::gcode($print);
like $gcode, qr/START:20mm_cube/, '[input_filename] is also available in custom G-code';
}
__END__ __END__