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

Remove .zip from file extension on import to avoid having it added again and again when exporting

Browse source
This commit is contained in:
Enrico Turri 2018-02-22 15:27:32 +01:00
parent 662ea15c23
commit 52eb6f6bcf
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xs/src/libslic3r/Model.cpp
View file

@ -12,6 +12,7 @@
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/nowide/iostream.hpp> #include <boost/nowide/iostream.hpp>
#include <boost/algorithm/string/replace.hpp>
namespace Slic3r { namespace Slic3r {
@ -91,7 +92,15 @@ Model Model::read_from_archive(const std::string &input_file, PresetBundle* bund
throw std::runtime_error("The supplied file couldn't be read because it's empty"); throw std::runtime_error("The supplied file couldn't be read because it's empty");
for (ModelObject *o : model.objects) for (ModelObject *o : model.objects)
o->input_file = input_file; {
if (boost::algorithm::iends_with(input_file, ".zip.amf"))
{
// we remove the .zip part of the extension to avoid it be added to filenames when exporting
o->input_file = boost::ireplace_last_copy(input_file, ".zip.", ".");
}
else
o->input_file = input_file;
}
if (add_default_instances) if (add_default_instances)
model.add_default_instances(); model.add_default_instances();