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

Follow-up of 00ecafe3d5 -> Fix of #3650 moved into 'SLAPrint::output_filename()' as the previous fix was breaking the export from GUI

Browse source
This commit is contained in:
Enrico Turri 2020-02-12 15:39:04 +01:00
parent 00ecafe3d5
commit c55173eba4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/PrintBase.cpp
View file

@ -64,7 +64,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
boost::filesystem::path filename = format.empty() ?
cfg.opt_string("input_filename_base") + default_ext :
this->placeholder_parser().process(format, 0, &cfg);
if (filename.extension().string() != default_ext)
if (filename.extension().empty())
filename = boost::filesystem::change_extension(filename, default_ext);
return filename.string();
} catch (std::runtime_error &err) {

4
src/libslic3r/SLAPrint.cpp
View file

@ -597,7 +597,9 @@ void SLAPrint::finalize()
std::string SLAPrint::output_filename(const std::string &filename_base) const
{
DynamicConfig config = this->finished() ? this->print_statistics().config() : this->print_statistics().placeholders();
return this->PrintBase::output_filename(m_print_config.output_filename_format.value, ".sl1", filename_base, &config);
// we need to remove the extension from the format string or the following call to PrintBase::output_filename() won't be able to change it to ".sl1"
std::string format = boost::filesystem::path(m_print_config.output_filename_format.value).replace_extension("").string();
return this->PrintBase::output_filename(format, ".sl1", filename_base, &config);
}
std::string SLAPrint::validate() const