From 5deb4470c7ed8e0709809f98525082965ba700d8 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 4 Aug 2023 14:44:45 +0200 Subject: [PATCH] Changes required by updated library libbgcode --- src/libslic3r/CMakeLists.txt | 2 +- src/libslic3r/Config.cpp | 4 ++-- src/libslic3r/GCode.cpp | 8 ++++---- src/libslic3r/GCode.hpp | 2 +- src/libslic3r/GCode/GCodeProcessor.cpp | 22 +++++++++++----------- src/libslic3r/GCode/GCodeProcessor.hpp | 12 ++++++------ src/libslic3r/GCode/Thumbnails.hpp | 6 +++--- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index ce57ba00f2..de4ec3a5d7 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -16,7 +16,7 @@ endif() find_package(LibBGCode REQUIRED COMPONENTS Convert) slic3r_remap_configs(LibBGCode::bgcode_core RelWithDebInfo Release) -slic3r_remap_configs(LibBGCode::bgcode_base RelWithDebInfo Release) +slic3r_remap_configs(LibBGCode::bgcode_binarize RelWithDebInfo Release) slic3r_remap_configs(LibBGCode::bgcode_convert RelWithDebInfo Release) set(SLIC3R_SOURCES diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index af28307faf..5d2de1aaa5 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -24,7 +24,7 @@ #include #if ENABLE_BINARIZED_GCODE -#include +#include #endif // ENABLE_BINARIZED_GCODE //FIXME for GCodeFlavor and gcfMarlin (for forward-compatibility conversion) @@ -1090,7 +1090,7 @@ ConfigSubstitutions ConfigBase::load_from_binary_gcode_file(const std::string& f throw Slic3r::RuntimeError(format("Error while reading file '%1%': %2%", filename, std::string(bgcode::core::translate_result(res)))); if ((bgcode::core::EBlockType)block_header.type != bgcode::core::EBlockType::SlicerMetadata) throw Slic3r::RuntimeError(format("Unable to find slicer metadata block in file: '%1%'", filename)); - bgcode::base::SlicerMetadataBlock slicer_metadata_block; + bgcode::binarize::SlicerMetadataBlock slicer_metadata_block; res = slicer_metadata_block.read_data(*file.f, file_header, block_header); if (res != bgcode::core::EResult::Success) throw Slic3r::RuntimeError(format("Error while reading file '%1%': %2%", filename, std::string(bgcode::core::translate_result(res)))); diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 0740ffb415..d10cd6bb59 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -841,7 +841,7 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu m_processor.initialize(path_tmp); m_processor.set_print(print); #if ENABLE_BINARIZED_GCODE - m_processor.get_binary_data() = bgcode::base::BinaryData(); + m_processor.get_binary_data() = bgcode::binarize::BinaryData(); #endif // ENABLE_BINARIZED_GCODE GCodeOutputStream file(boost::nowide::fopen(path_tmp.c_str(), "wb"), m_processor); if (! file.is_open()) @@ -984,7 +984,7 @@ namespace DoExport { unsigned int initial_extruder_id, PrintStatistics &print_statistics, bool export_binary_data, - bgcode::base::BinaryData &binary_data) + bgcode::binarize::BinaryData &binary_data) #else static std::string update_print_stats_and_format_filament_stats( const bool has_wipe_tower, @@ -1132,7 +1132,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato // 1) generate the thumbnails // 2) collect the config data if (export_to_binary_gcode) { - bgcode::base::BinaryData& binary_data = m_processor.get_binary_data(); + bgcode::binarize::BinaryData& binary_data = m_processor.get_binary_data(); // Unit tests or command line slicing may not define "thumbnails" or "thumbnails_format". // If "thumbnails_format" is not defined, export to PNG. @@ -1611,7 +1611,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato file.write(filament_stats_string_out); if (export_to_binary_gcode) { - bgcode::base::BinaryData& binary_data = m_processor.get_binary_data(); + bgcode::binarize::BinaryData& binary_data = m_processor.get_binary_data(); if (print.m_print_statistics.total_toolchanges > 0) binary_data.print_metadata.raw_data.push_back({ "total toolchanges", std::to_string(print.m_print_statistics.total_toolchanges) }); } diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 1821576fd7..4032aef39e 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -29,7 +29,7 @@ #include "GCode/PressureEqualizer.hpp" #if ENABLE_BINARIZED_GCODE -#include +#include #endif // ENABLE_BINARIZED_GCODE namespace Slic3r { diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index 37ac7eb37a..5787b6e17d 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -70,7 +70,7 @@ const float GCodeProcessor::Wipe_Width = 0.05f; const float GCodeProcessor::Wipe_Height = 0.05f; #if ENABLE_BINARIZED_GCODE -bgcode::base::BinarizerConfig GCodeProcessor::s_binarizer_config{}; +bgcode::binarize::BinarizerConfig GCodeProcessor::s_binarizer_config{}; #endif // ENABLE_BINARIZED #if ENABLE_GCODE_VIEWER_DATA_CHECKING @@ -1152,7 +1152,7 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); if ((bgcode::core::EBlockType)block_header.type != bgcode::core::EBlockType::FileMetadata) throw Slic3r::RuntimeError("Unable to find file metadata block in file: " + filename + "\n"); - bgcode::base::FileMetadataBlock file_metadata_block; + bgcode::binarize::FileMetadataBlock file_metadata_block; res = file_metadata_block.read_data(*file.f, file_header, block_header); if (res != bgcode::core::EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); @@ -1169,7 +1169,7 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); if ((bgcode::core::EBlockType)block_header.type != bgcode::core::EBlockType::PrinterMetadata) throw Slic3r::RuntimeError("Unable to find printer metadata block in file: " + filename + "\n"); - bgcode::base::PrinterMetadataBlock printer_metadata_block; + bgcode::binarize::PrinterMetadataBlock printer_metadata_block; res = printer_metadata_block.read_data(*file.f, file_header, block_header); if (res != bgcode::core::EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); @@ -1189,13 +1189,13 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); while ((bgcode::core::EBlockType)block_header.type == bgcode::core::EBlockType::Thumbnail) { - bgcode::base::ThumbnailBlock thumbnail_block; + bgcode::binarize::ThumbnailBlock thumbnail_block; res = thumbnail_block.read_data(*file.f, file_header, block_header); if (res != bgcode::core::EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); #if ENABLE_BINARIZED_GCODE_DEBUG if (thumbnail_block.data.size() > 0) { - auto format_filename = [](const std::string& stem, const bgcode::base::ThumbnailBlock& block) { + auto format_filename = [](const std::string& stem, const bgcode::binarize::ThumbnailBlock& block) { std::string ret = stem + "_" + std::to_string(block.width) + "x" + std::to_string(block.height); switch ((bgcode::core::EThumbnailFormat)block.format) { @@ -1225,7 +1225,7 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct // read print metadata block if ((bgcode::core::EBlockType)block_header.type != bgcode::core::EBlockType::PrintMetadata) throw Slic3r::RuntimeError("Unable to find print metadata block in file: " + filename + "\n"); - bgcode::base::PrintMetadataBlock print_metadata_block; + bgcode::binarize::PrintMetadataBlock print_metadata_block; res = print_metadata_block.read_data(*file.f, file_header, block_header); if (res != bgcode::core::EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); @@ -1245,7 +1245,7 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); if ((bgcode::core::EBlockType)block_header.type != bgcode::core::EBlockType::SlicerMetadata) throw Slic3r::RuntimeError("Unable to find slicer metadata block in file: " + filename + "\n"); - bgcode::base::SlicerMetadataBlock slicer_metadata_block; + bgcode::binarize::SlicerMetadataBlock slicer_metadata_block; res = slicer_metadata_block.read_data(*file.f, file_header, block_header); if (res != bgcode::core::EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); @@ -1281,7 +1281,7 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct if ((bgcode::core::EBlockType)block_header.type != bgcode::core::EBlockType::GCode) throw Slic3r::RuntimeError("Unable to find gcode block in file: " + filename + "\n"); while ((bgcode::core::EBlockType)block_header.type == bgcode::core::EBlockType::GCode) { - bgcode::base::GCodeBlock block; + bgcode::binarize::GCodeBlock block; res = block.read_data(*file.f, file_header, block_header); if (res != bgcode::core::EResult::Success) throw Slic3r::RuntimeError("Error while reading file '" + filename + "': " + std::string(bgcode::core::translate_result(res)) + "\n"); @@ -3685,7 +3685,7 @@ void GCodeProcessor::post_process() }; // update binary data - bgcode::base::BinaryData& binary_data = m_binarizer.get_binary_data(); + bgcode::binarize::BinaryData& binary_data = m_binarizer.get_binary_data(); binary_data.print_metadata.raw_data.push_back({ PrintStatistics::FilamentUsedMm, stringify(filament_mm) }); binary_data.print_metadata.raw_data.push_back({ PrintStatistics::FilamentUsedCm3, stringify(filament_cm3) }); binary_data.print_metadata.raw_data.push_back({ PrintStatistics::FilamentUsedG, stringify(filament_g) }); @@ -3832,12 +3832,12 @@ void GCodeProcessor::post_process() size_t m_out_file_pos{ 0 }; #if ENABLE_BINARIZED_GCODE - bgcode::base::Binarizer& m_binarizer; + bgcode::binarize::Binarizer& m_binarizer; #endif // ENABLE_BINARIZED_GCODE public: #if ENABLE_BINARIZED_GCODE - ExportLines(bgcode::base::Binarizer& binarizer, EWriteType type, TimeMachine& machine) + ExportLines(bgcode::binarize::Binarizer& binarizer, EWriteType type, TimeMachine& machine) #ifndef NDEBUG : m_statistics(*this), m_binarizer(binarizer), m_write_type(type), m_machine(machine) {} #else diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp index 303a6868d1..bef1cd68f3 100644 --- a/src/libslic3r/GCode/GCodeProcessor.hpp +++ b/src/libslic3r/GCode/GCodeProcessor.hpp @@ -8,7 +8,7 @@ #include "libslic3r/CustomGCode.hpp" #if ENABLE_BINARIZED_GCODE -#include +#include #endif // ENABLE_BINARIZED_GCODE #include @@ -528,14 +528,14 @@ namespace Slic3r { #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING #if ENABLE_BINARIZED_GCODE_DEBUG_WINDOW - static bgcode::base::BinarizerConfig& get_binarizer_config() { return s_binarizer_config; } + static bgcode::binarize::BinarizerConfig& get_binarizer_config() { return s_binarizer_config; } #endif // ENABLE_BINARIZED_GCODE_DEBUG_WINDOW private: GCodeReader m_parser; #if ENABLE_BINARIZED_GCODE - bgcode::base::Binarizer m_binarizer; - static bgcode::base::BinarizerConfig s_binarizer_config; + bgcode::binarize::Binarizer m_binarizer; + static bgcode::binarize::BinarizerConfig s_binarizer_config; #endif // ENABLE_BINARIZED_GCODE EUnits m_units; @@ -635,8 +635,8 @@ namespace Slic3r { void apply_config(const PrintConfig& config); void set_print(Print* print) { m_print = print; } #if ENABLE_BINARIZED_GCODE - bgcode::base::BinaryData& get_binary_data() { return m_binarizer.get_binary_data(); } - const bgcode::base::BinaryData& get_binary_data() const { return m_binarizer.get_binary_data(); } + bgcode::binarize::BinaryData& get_binary_data() { return m_binarizer.get_binary_data(); } + const bgcode::binarize::BinaryData& get_binary_data() const { return m_binarizer.get_binary_data(); } #endif // ENABLE_BINARIZED_GCODE void enable_stealth_time_estimator(bool enabled); diff --git a/src/libslic3r/GCode/Thumbnails.hpp b/src/libslic3r/GCode/Thumbnails.hpp index 7e99013962..4bd6637879 100644 --- a/src/libslic3r/GCode/Thumbnails.hpp +++ b/src/libslic3r/GCode/Thumbnails.hpp @@ -10,7 +10,7 @@ #include #if ENABLE_BINARIZED_GCODE -#include +#include #endif // ENABLE_BINARIZED_GCODE #include @@ -61,7 +61,7 @@ inline void export_thumbnails_to_file(ThumbnailsGeneratorCallback &thumbnail_cb, #if ENABLE_BINARIZED_GCODE template -inline void generate_binary_thumbnails(ThumbnailsGeneratorCallback& thumbnail_cb, std::vector& out_thumbnails, +inline void generate_binary_thumbnails(ThumbnailsGeneratorCallback& thumbnail_cb, std::vector& out_thumbnails, const std::vector& sizes, GCodeThumbnailsFormat format, ThrowIfCanceledCallback throw_if_canceled) { out_thumbnails.clear(); @@ -71,7 +71,7 @@ inline void generate_binary_thumbnails(ThumbnailsGeneratorCallback& thumbnail_cb if (data.is_valid()) { auto compressed = compress_thumbnail(data, format); if (compressed->data != nullptr && compressed->size > 0) { - bgcode::base::ThumbnailBlock& block = out_thumbnails.emplace_back(bgcode::base::ThumbnailBlock()); + bgcode::binarize::ThumbnailBlock& block = out_thumbnails.emplace_back(bgcode::binarize::ThumbnailBlock()); block.width = (uint16_t)data.width; block.height = (uint16_t)data.height; switch (format) { diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index b609795fd2..c4a8d093df 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -7874,7 +7874,7 @@ void GLCanvas3D::GizmoHighlighter::blink() #if ENABLE_BINARIZED_GCODE_DEBUG_WINDOW void GLCanvas3D::show_binary_gcode_debug_window() { - bgcode::base::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config(); + bgcode::binarize::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config(); ImGuiWrapper& imgui = *wxGetApp().imgui(); imgui.begin(std::string("Binary GCode"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index b9eb5a3c1c..ddab7d6c32 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5507,7 +5507,7 @@ void Plater::convert_gcode_to_binary() // Perform conversion { wxBusyCursor busy; - const bgcode::base::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config(); + const bgcode::binarize::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config(); bgcode::core::EResult res = bgcode::convert::from_ascii_to_binary(*in_file.f, *out_file.f, binarizer_config); if (res != bgcode::core::EResult::Success) { MessageDialog msg_dlg(this, _L(std::string(bgcode::core::translate_result(res))), _L("Error converting gcode file"), wxICON_INFORMATION | wxOK);