3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

One more change to multi-value placeholders: indices start from 0. #1899

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-04-29 17:12:00 +02:00
parent a4b6075600
commit 7a9dec3720
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Slic3r/GCode/PlaceholderParser.pm
View file

@ -43,7 +43,7 @@ sub apply_config {
foreach my $opt_key (@opt_keys) {
my $value = $config->$opt_key;
next unless ref($value) eq 'ARRAY';
$m->{"${opt_key}_" . ($_+1)} = $value->[$_] for 0..$#$value;
$m->{"${opt_key}_" . $_} = $value->[$_] for 0..$#$value;
$m->{$opt_key} = $value->[0];
if ($Slic3r::Config::Options->{$opt_key}{type} eq 'point') {
$m->{"${opt_key}_X"} = $value->[0];
@ -73,8 +73,8 @@ sub process {
my $regex = join '|', keys %{$self->_multiple};
$string =~ s/\[($regex)\]/$self->_multiple->{$1}/egx;
# unhandled indices are populated using the first value, except _0 which is ignored for safety
$string =~ s/\[($regex)_[1-9]\d*\]/$self->_multiple->{$1}/egx;
# unhandled indices are populated using the first value
$string =~ s/\[($regex)_\d+\]/$self->_multiple->{$1}/egx;
}
return $string;