Added the [scale] placeholder. #2791

slic3r · May 2, 2015 · 7d81aee · 7d81aee
1 parent 00acd32
commit 7d81aee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
@@ -432,6 +432,11 @@ sub expanded_output_filepath {
     $self->placeholder_parser->set(input_filename => $filename);
     $self->placeholder_parser->set(input_filename_base => $filename_base);
 
+    # set other variables from model object
+    $self->placeholder_parser->set_multiple(
+        scale => [ map $_->model_object->instances->[0]->scaling_factor * 100 . "%", @{$self->objects} ],
+    );
+
     if ($path && -d $path) {
         # if output path is an existing directory, we take that and append
         # the specified filename format

diff --git a/xs/xsp/PlaceholderParser.xsp b/xs/xsp/PlaceholderParser.xsp
@@ -14,6 +14,8 @@
     void apply_config(DynamicPrintConfig *config)
         %code%{ THIS->apply_config(*config); %};
     void set(std::string key, std::string value);
+    void set_multiple(std::string key, std::vector<std::string> values)
+        %code%{ THIS->set(key, values); %};
 
     void _single_set(std::string k, std::string v)
         %code%{ THIS->_single[k] = v; %};