diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index 2d4780d0ec..f5902f403e 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -740,11 +740,7 @@ ConfigSubstitutions ConfigBase::load(const boost::property_tree::ptree &tree, Fo } // Load the config keys from the given string. -#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT size_t ConfigBase::load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions) -#else -static inline size_t load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions) -#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT { if (str == nullptr) return 0; diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp index 429f5901c8..b8a838f0d5 100644 --- a/src/libslic3r/Config.hpp +++ b/src/libslic3r/Config.hpp @@ -2017,9 +2017,7 @@ public: // Set all the nullable values to nils. void null_nullables(); -#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT static size_t load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions); -#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT private: // Set a configuration value from a string. diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index 3889321b26..79eca1aa38 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -748,9 +748,7 @@ const std::vector> GCodeProces { EProducer::PrusaSlicer, "generated by PrusaSlicer" }, { EProducer::Slic3rPE, "generated by Slic3r Prusa Edition" }, { EProducer::Slic3r, "generated by Slic3r" }, -#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT { EProducer::SuperSlicer, "generated by SuperSlicer" }, -#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT { EProducer::Cura, "Cura_SteamEngine" }, { EProducer::Simplify3D, "G-Code generated by Simplify3D(R)" }, { EProducer::CraftWare, "CraftWare" }, @@ -1234,10 +1232,8 @@ void GCodeProcessor::process_file(const std::string& filename, std::function> GCodeProcessor::get_roles_time(Prin return ret; } -#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT ConfigSubstitutions load_from_superslicer_gcode_file(const std::string& filename, DynamicPrintConfig& config, ForwardCompatibilitySubstitutionRule compatibility_rule) { // for reference, see: ConfigBase::load_from_gcode_file() @@ -1404,7 +1399,6 @@ void GCodeProcessor::apply_config_superslicer(const std::string& filename) load_from_superslicer_gcode_file(filename, config, ForwardCompatibilitySubstitutionRule::EnableSilent); apply_config(config); } -#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT std::vector GCodeProcessor::get_layers_time(PrintEstimatedStatistics::ETimeMode mode) const { @@ -1890,9 +1884,7 @@ bool GCodeProcessor::process_producers_tags(const std::string_view comment) { case EProducer::Slic3rPE: case EProducer::Slic3r: -#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT case EProducer::SuperSlicer: -#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT case EProducer::PrusaSlicer: { return process_prusaslicer_tags(comment); } case EProducer::Cura: { return process_cura_tags(comment); } case EProducer::Simplify3D: { return process_simplify3d_tags(comment); } diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp index 485cb87c82..c3a050985e 100644 --- a/src/libslic3r/GCode/GCodeProcessor.hpp +++ b/src/libslic3r/GCode/GCodeProcessor.hpp @@ -542,9 +542,7 @@ namespace Slic3r { PrusaSlicer, Slic3rPE, Slic3r, -#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT SuperSlicer, -#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT Cura, Simplify3D, CraftWare, @@ -601,9 +599,7 @@ namespace Slic3r { private: void apply_config(const DynamicPrintConfig& config); void apply_config_simplify3d(const std::string& filename); -#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT void apply_config_superslicer(const std::string& filename); -#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT void process_gcode_line(const GCodeReader::GCodeLine& line, bool producers_enabled); // Process tags embedded into comments diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index f3356d9e79..ef975461e2 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -36,15 +36,6 @@ #define ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS 1 -//==================== -// 2.4.0.alpha3 techs -//==================== -#define ENABLE_2_4_0_ALPHA3 1 - -// Enable fixing loading of gcode files generated with SuperSlicer in GCodeViewer -#define ENABLE_FIX_SUPERSLICER_GCODE_IMPORT (1 && ENABLE_2_4_0_ALPHA3) - - //==================== // 2.4.0.beta1 techs //====================