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

#4982 - Load config data when importing gcode produced by Slic3r and Slic3rPE

Browse Source
This commit is contained in:
enricoturri1966 2020-10-27 17:18:15 +01:00
parent 00ec9cc4ed
commit 128e4cff2d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,6 +466,8 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
const std::vector<std::pair<GCodeProcessor::EProducer, std::string>> GCodeProcessor::Producers = { const std::vector<std::pair<GCodeProcessor::EProducer, std::string>> GCodeProcessor::Producers = {
{ EProducer::PrusaSlicer, "PrusaSlicer" }, { EProducer::PrusaSlicer, "PrusaSlicer" },
{ EProducer::Slic3rPE, "Slic3r Prusa Edition" },
{ EProducer::Slic3r, "Slic3r" },
{ EProducer::Cura, "Cura_SteamEngine" }, { EProducer::Cura, "Cura_SteamEngine" },
{ EProducer::Simplify3D, "Simplify3D" }, { EProducer::Simplify3D, "Simplify3D" },
{ EProducer::CraftWare, "CraftWare" }, { EProducer::CraftWare, "CraftWare" },
@ -751,7 +753,7 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
// if the gcode was produced by PrusaSlicer, // if the gcode was produced by PrusaSlicer,
// extract the config from it // extract the config from it
if (m_producer == EProducer::PrusaSlicer) { if (m_producer == EProducer::PrusaSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) {
DynamicPrintConfig config; DynamicPrintConfig config;
config.apply(FullPrintConfig::defaults()); config.apply(FullPrintConfig::defaults());
config.load_from_gcode_file(filename); config.load_from_gcode_file(filename);

2
src/libslic3r/GCode/GCodeProcessor.hpp
View File

@ -383,6 +383,8 @@ namespace Slic3r {
{ {
Unknown, Unknown,
PrusaSlicer, PrusaSlicer,
Slic3rPE,
Slic3r,
Cura, Cura,
Simplify3D, Simplify3D,
CraftWare, CraftWare,