3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes

Browse source
This commit is contained in:
Enrico Turri 2019-02-01 12:18:24 +01:00
commit 2557341366
4 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/GCode/SpiralVase.hpp
View file

@ -13,7 +13,7 @@ class SpiralVase {
SpiralVase(const PrintConfig &config) SpiralVase(const PrintConfig &config)
: enable(false), _config(&config) : enable(false), _config(&config)
{ {
this->_reader.z() = this->_config->z_offset; this->_reader.z() = (float)this->_config->z_offset;
this->_reader.apply_config(*this->_config); this->_reader.apply_config(*this->_config);
}; };
std::string process_layer(const std::string &gcode); std::string process_layer(const std::string &gcode);

2
src/libslic3r/GCodeReader.hpp
View file

@ -43,7 +43,7 @@ public:
} }
bool cmd_is(const char *cmd_test) const { bool cmd_is(const char *cmd_test) const {
const char *cmd = GCodeReader::skip_whitespaces(m_raw.c_str()); const char *cmd = GCodeReader::skip_whitespaces(m_raw.c_str());
int len = strlen(cmd_test); size_t len = strlen(cmd_test);
return strncmp(cmd, cmd_test, len) == 0 && GCodeReader::is_end_of_word(cmd[len]); return strncmp(cmd, cmd_test, len) == 0 && GCodeReader::is_end_of_word(cmd[len]);
} }
bool extruding(const GCodeReader &reader) const { return this->cmd_is("G1") && this->dist_E(reader) > 0; } bool extruding(const GCodeReader &reader) const { return this->cmd_is("G1") && this->dist_E(reader) > 0; }

13
src/libslic3r/Model.cpp
View file

@ -549,11 +549,18 @@ void Model::reset_auto_extruder_id()
std::string Model::propose_export_file_name() const std::string Model::propose_export_file_name() const
{ {
std::string input_file;
for (const ModelObject *model_object : this->objects) for (const ModelObject *model_object : this->objects)
for (ModelInstance *model_instance : model_object->instances) for (ModelInstance *model_instance : model_object->instances)
if (model_instance->is_printable()) if (model_instance->is_printable()) {
return model_object->name.empty() ? model_object->input_file : model_object->name; input_file = model_object->name.empty() ? model_object->input_file : model_object->name;
return std::string(); if (! input_file.empty())
goto end;
// Other instances will produce the same name, skip them.
break;
}
end:
return input_file;
} }
ModelObject::~ModelObject() ModelObject::~ModelObject()

15
src/libslic3r/PrintBase.cpp
View file

@ -67,20 +67,9 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
std::string PrintBase::output_filepath(const std::string &path) const std::string PrintBase::output_filepath(const std::string &path) const
{ {
// if we were supplied no path, generate an automatic one based on our first object's input file // if we were supplied no path, generate an automatic one based on our first object's input file
if (path.empty()) { if (path.empty())
// get the first input file name // get the first input file name
std::string input_file; return (boost::filesystem::path(m_model.propose_export_file_name()).parent_path() / this->output_filename()).make_preferred().string();
for (const ModelObject *model_object : m_model.objects) {
for (ModelInstance *model_instance : model_object->instances)
if (model_instance->is_printable()) {
input_file = model_object->input_file;
break;
}
if (! input_file.empty())
break;
}
return (boost::filesystem::path(input_file).parent_path() / this->output_filename()).make_preferred().string();
}
// if we were supplied a directory, use it and append our automatically generated filename // if we were supplied a directory, use it and append our automatically generated filename
boost::filesystem::path p(path); boost::filesystem::path p(path);