GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 16:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed "input_filename" placeholder, it was not generated correctly

Browse Source 
since PrusaSlicer 2.0.0 and nobody complained.
This commit is contained in:
Vojtech Bubnik 2023-09-12 13:44:43 +02:00
parent b33b28c076
commit 0cbbe96d08
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/PrintBase.cpp
View File

@ -21,7 +21,7 @@ void PrintTryCancel::operator()() const
size_t PrintStateBase::g_last_timestamp = 0; size_t PrintStateBase::g_last_timestamp = 0;
// Update "scale", "input_filename", "input_filename_base" placeholders from the current m_objects. // Update "scale", "input_filename", "input_filename_base" placeholders from the current m_objects.
void PrintBase::update_object_placeholders(DynamicConfig &config, const std::string &default_ext) const void PrintBase::update_object_placeholders(DynamicConfig &config, const std::string & /* default_output_ext */) const
{ {
// get the first input file name // get the first input file name
std::string input_file; std::string input_file;
@ -54,7 +54,7 @@ void PrintBase::update_object_placeholders(DynamicConfig &config, const std::str
// get basename with and without suffix // get basename with and without suffix
const std::string input_filename = boost::filesystem::path(input_file).filename().string(); const std::string input_filename = boost::filesystem::path(input_file).filename().string();
const std::string input_filename_base = input_filename.substr(0, input_filename.find_last_of(".")); const std::string input_filename_base = input_filename.substr(0, input_filename.find_last_of("."));
config.set_key_value("input_filename", new ConfigOptionString(input_filename_base + default_ext)); // config.set_key_value("input_filename", new ConfigOptionString(input_filename_base + default_output_ext));
config.set_key_value("input_filename_base", new ConfigOptionString(input_filename_base)); config.set_key_value("input_filename_base", new ConfigOptionString(input_filename_base));
} }
} }
@ -70,7 +70,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
PlaceholderParser::update_timestamp(cfg); PlaceholderParser::update_timestamp(cfg);
this->update_object_placeholders(cfg, default_ext); this->update_object_placeholders(cfg, default_ext);
if (! filename_base.empty()) { if (! filename_base.empty()) {
cfg.set_key_value("input_filename", new ConfigOptionString(filename_base + default_ext)); // cfg.set_key_value("input_filename", new ConfigOptionString(filename_base + default_ext));
cfg.set_key_value("input_filename_base", new ConfigOptionString(filename_base)); cfg.set_key_value("input_filename_base", new ConfigOptionString(filename_base));
} }
try { try {

2
src/libslic3r/PrintBase.hpp
View File

@ -552,7 +552,7 @@ protected:
// To be called by this->output_filename() with the format string pulled from the configuration layer. // To be called by this->output_filename() with the format string pulled from the configuration layer.
std::string output_filename(const std::string &format, const std::string &default_ext, const std::string &filename_base, const DynamicConfig *config_override = nullptr) const; std::string output_filename(const std::string &format, const std::string &default_ext, const std::string &filename_base, const DynamicConfig *config_override = nullptr) const;
// Update "scale", "input_filename", "input_filename_base" placeholders from the current printable ModelObjects. // Update "scale", "input_filename", "input_filename_base" placeholders from the current printable ModelObjects.
void update_object_placeholders(DynamicConfig &config, const std::string &default_ext) const; void update_object_placeholders(DynamicConfig &config, const std::string &default_output_ext) const;
Model m_model; Model m_model;
DynamicPrintConfig m_full_print_config; DynamicPrintConfig m_full_print_config;