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

Restore [input_filename] in custom G-code as well

Browse source
This commit is contained in:
Alessandro Ranellucci 2016-12-20 19:26:23 +01:00 • committed by bubnikv
parent 4528f35bc0
commit 6f11969257
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
xs/src/libslic3r/Print.cpp
View file

@ -6,6 +6,8 @@
#include "Geometry.hpp" #include "Geometry.hpp"
#include "SupportMaterial.hpp" #include "SupportMaterial.hpp"
#include <algorithm> #include <algorithm>
#include <boost/filesystem.hpp>
#include <boost/lexical_cast.hpp>
namespace Slic3r { namespace Slic3r {
@ -410,6 +412,29 @@ Print::add_model_object(ModelObject* model_object, int idx)
// apply config to print object // apply config to print object
o->config.apply(this->default_object_config); o->config.apply(this->default_object_config);
o->config.apply(object_config, true); o->config.apply(object_config, true);
// update placeholders
{
// get the first input file name
std::string input_file;
std::vector<std::string> v_scale;
for (const PrintObject *object : this->objects) {
const ModelObject &mobj = *object->model_object();
v_scale.push_back( boost::lexical_cast<std::string>(mobj.instances[0]->scaling_factor*100) + "%" );
if (input_file.empty())
input_file = mobj.input_file;
}
PlaceholderParser &pp = this->placeholder_parser;
pp.set("scale", v_scale);
if (!input_file.empty()) {
// get basename with and without suffix
const std::string input_basename = boost::filesystem::path(input_file).filename().string();
pp.set("input_filename", input_basename);
const std::string input_basename_base = input_basename.substr(0, input_basename.find_last_of("."));
pp.set("input_filename_base", input_basename_base);
}
}
} }
bool bool