From d6ca8134ed52967692e29bacfbe0c36d19a19b0c Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 5 Sep 2023 08:34:40 +0200 Subject: [PATCH] Removal of tech ENABLE_BINARIZED_GCODE_WIN_DEBUG --- src/libslic3r/GCode/GCodeProcessor.cpp | 31 -------------------------- src/libslic3r/Technologies.hpp | 3 --- src/slic3r/GUI/GCodeViewer.cpp | 5 ----- 3 files changed, 39 deletions(-) diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index 9d8b0345ef..25777ea200 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -31,10 +31,6 @@ #endif #include -#if ENABLE_BINARIZED_GCODE_WIN_DEBUG -#include -#include -#endif // ENABLE_BINARIZED_GCODE_WIN_DEBUG static const float DEFAULT_TOOLPATH_WIDTH = 0.4f; static const float DEFAULT_TOOLPATH_HEIGHT = 0.2f; @@ -1206,15 +1202,6 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct res = printer_metadata_block.read_data(*file.f, file_header, block_header); if (res != EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(translate_result(res)) + "\n"); -#if ENABLE_BINARIZED_GCODE_WIN_DEBUG - OutputDebugStringA("Printer metadata:\n"); - for (const auto& [key, value] : printer_metadata_block.raw_data) { - OutputDebugStringA(key.c_str()); - OutputDebugStringA("->"); - OutputDebugStringA(value.c_str()); - OutputDebugStringA("\n"); - } -#endif // ENABLE_BINARIZED_GCODE_WIN_DEBUG // read thumbnail blocks res = read_next_block_header(*file.f, file_header, block_header, cs_buffer.data(), cs_buffer.size()); @@ -1262,15 +1249,6 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct res = print_metadata_block.read_data(*file.f, file_header, block_header); if (res != EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(translate_result(res)) + "\n"); -#if ENABLE_BINARIZED_GCODE_WIN_DEBUG - OutputDebugStringA("Print metadata:\n"); - for (const auto& [key, value] : print_metadata_block.raw_data) { - OutputDebugStringA(key.c_str()); - OutputDebugStringA("->"); - OutputDebugStringA(value.c_str()); - OutputDebugStringA("\n"); - } -#endif // ENABLE_BINARIZED_GCODE_WIN_DEBUG // read slicer metadata block res = read_next_block_header(*file.f, file_header, block_header, cs_buffer.data(), cs_buffer.size()); @@ -1282,15 +1260,6 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct res = slicer_metadata_block.read_data(*file.f, file_header, block_header); if (res != EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(translate_result(res)) + "\n"); -#if ENABLE_BINARIZED_GCODE_WIN_DEBUG - OutputDebugStringA("Slicer metadata:\n"); - for (const auto& [key, value] : slicer_metadata_block.raw_data) { - OutputDebugStringA(key.c_str()); - OutputDebugStringA("->"); - OutputDebugStringA(value.c_str()); - OutputDebugStringA("\n"); - } -#endif // ENABLE_BINARIZED_GCODE_WIN_DEBUG DynamicPrintConfig config; config.apply(FullPrintConfig::defaults()); std::string str; diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index a42a9d4b05..955c7988e1 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -66,9 +66,6 @@ // Enable export of binarized gcode #define ENABLE_BINARIZED_GCODE (1 && ENABLE_2_6_2_ALPHA1) #define ENABLE_BINARIZED_GCODE_DEBUG (0 && ENABLE_BINARIZED_GCODE) -#ifdef _WIN32 -#define ENABLE_BINARIZED_GCODE_WIN_DEBUG (1 && ENABLE_BINARIZED_GCODE_DEBUG) -#endif // _WIN32 #define ENABLE_BINARIZED_GCODE_DEBUG_WINDOW (1 && ENABLE_BINARIZED_GCODE) #endif // _prusaslicer_technologies_h_ diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index b069545834..20514bd312 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -44,11 +44,6 @@ #include #include -#if ENABLE_BINARIZED_GCODE_WIN_DEBUG -#include -#include -#endif // ENABLE_BINARIZED_GCODE_WIN_DEBUG - namespace Slic3r { namespace GUI {