GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-26 08:54:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix settings printing & failsafe for gcode viewer

Browse Source
This commit is contained in:
supermerill 2020-11-11 19:42:38 +01:00
parent be088cc149
commit 027bf9f132
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode.hpp
View File

@ -465,7 +465,7 @@ private:
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
// Write a string into a file. // Write a string into a file.
void _write(FILE* file, const std::string& what, bool flush = false) { this->_write(file, what.c_str()); } void _write(FILE* file, const std::string& what, bool flush = false) { this->_write(file, what.c_str(), flush); }
void _write(FILE* file, const char *what, bool flush = false); void _write(FILE* file, const char *what, bool flush = false);
// Write a string into a file. // Write a string into a file.

15
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -812,11 +812,16 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
// if the gcode was produced by SuperSlicer, // if the gcode was produced by SuperSlicer,
// extract the config from it // extract the config from it
if (m_producer == EProducer::PrusaSlicer || m_producer == EProducer::SuperSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) { try {
DynamicPrintConfig config; if (m_producer == EProducer::PrusaSlicer || m_producer == EProducer::SuperSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) {
config.apply(FullPrintConfig::defaults()); DynamicPrintConfig config;
config.load_from_gcode_file(filename); config.apply(FullPrintConfig::defaults());
apply_config(config); config.load_from_gcode_file(filename);
apply_config(config);
}
}
catch (Exception ex) {
m_producer = EProducer::Unknown;
} }
} }