From f0831aebcf72419278736229166e239dda3d343d Mon Sep 17 00:00:00 2001 From: Dmytro Chystiakov Date: Fri, 12 Jan 2024 15:59:13 +0200 Subject: [PATCH] fix: 'print' was not declared in this scope --- src/libslic3r/GCode.cpp | 3 +++ src/libslic3r/GCode/GCodeProcessor.cpp | 4 +++- src/libslic3r/GCode/GCodeProcessor.hpp | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 75f670a0a..e5ef132d1 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1180,6 +1180,9 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu return; BOOST_LOG_TRIVIAL(info) << boost::format("Will export G-code to %1% soon")%path; + + GCodeProcessor::s_IsBBLPrinter = print->is_BBL_printer(); + print->set_started(psGCodeExport); // check if any custom gcode contains keywords used by the gcode processor to diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index 61ea8226e..a0431dcd5 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -71,6 +71,8 @@ const std::string GCodeProcessor::Flush_End_Tag = " FLUSH_END"; const float GCodeProcessor::Wipe_Width = 0.05f; const float GCodeProcessor::Wipe_Height = 0.05f; +bool GCodeProcessor::s_IsBBLPrinter = true; + #if ENABLE_GCODE_VIEWER_DATA_CHECKING const std::string GCodeProcessor::Mm3_Per_Mm_Tag = "MM3_PER_MM:"; #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING @@ -478,7 +480,7 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename, st PrintEstimatedStatistics::ETimeMode mode = static_cast(i); if (mode == PrintEstimatedStatistics::ETimeMode::Normal || machine.enabled) { char buf[128]; - if (!print.is_BBL_Printer()) { + if (!s_IsBBLPrinter) { // Klipper estimator sprintf(buf, "; estimated printing time (normal mode) = %s\n", get_time_dhms(machine.time)); diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp index 822edac43..39634b4a7 100644 --- a/src/libslic3r/GCode/GCodeProcessor.hpp +++ b/src/libslic3r/GCode/GCodeProcessor.hpp @@ -292,6 +292,8 @@ namespace Slic3r { static const float Wipe_Width; static const float Wipe_Height; + static bool s_IsBBLPrinter; + #if ENABLE_GCODE_VIEWER_DATA_CHECKING static const std::string Mm3_Per_Mm_Tag; #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING