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

Fixed naming of metadata exported to gcode file in binary format

Browse Source
This commit is contained in:
enricoturri1966 2023-08-04 08:33:28 +02:00
parent 1e993a481a
commit 28346f78dd
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/GCode.cpp
View File

@ -1146,29 +1146,27 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
} }
// file data // file data
binary_data.file_metadata.encoding_type = (uint16_t)bgcode::core::EMetadataEncodingType::INI;
binary_data.file_metadata.raw_data.emplace_back("Producer", std::string(SLIC3R_APP_NAME) + " " + std::string(SLIC3R_VERSION)); binary_data.file_metadata.raw_data.emplace_back("Producer", std::string(SLIC3R_APP_NAME) + " " + std::string(SLIC3R_VERSION));
// config data // config data
binary_data.slicer_metadata.encoding_type = (uint16_t)bgcode::core::EMetadataEncodingType::INI;
encode_full_config(print, binary_data.slicer_metadata.raw_data); encode_full_config(print, binary_data.slicer_metadata.raw_data);
// printer data // printer data
binary_data.printer_metadata.raw_data.emplace_back("printer model" , print.config().printer_model.value); // duplicated into config data binary_data.printer_metadata.raw_data.emplace_back("printer_model", print.config().printer_model.value); // duplicated into config data
std::string filament_types_str; std::string filament_types_str;
for (size_t i = 0; i < print.config().filament_type.values.size(); ++i) { for (size_t i = 0; i < print.config().filament_type.values.size(); ++i) {
filament_types_str += print.config().filament_type.values[i]; filament_types_str += print.config().filament_type.values[i];
if (i < print.config().filament_type.values.size() - 1) if (i < print.config().filament_type.values.size() - 1)
filament_types_str += ", "; filament_types_str += ", ";
} }
binary_data.printer_metadata.raw_data.emplace_back("filament type", filament_types_str); // duplicated into config data binary_data.printer_metadata.raw_data.emplace_back("filament_type", filament_types_str); // duplicated into config data
std::string nozzle_diameters_str; std::string nozzle_diameters_str;
char buf[1024]; char buf[1024];
for (size_t i = 0; i < print.config().nozzle_diameter.values.size(); ++i) { for (size_t i = 0; i < print.config().nozzle_diameter.values.size(); ++i) {
sprintf(buf, i < print.config().nozzle_diameter.values.size() - 1 ? "%.2lf, " : "%.2lf", print.config().nozzle_diameter.values[i]); sprintf(buf, i < print.config().nozzle_diameter.values.size() - 1 ? "%.2lf, " : "%.2lf", print.config().nozzle_diameter.values[i]);
nozzle_diameters_str += buf; nozzle_diameters_str += buf;
} }
binary_data.printer_metadata.raw_data.emplace_back("nozzle diameter", nozzle_diameters_str); // duplicated into config data binary_data.printer_metadata.raw_data.emplace_back("nozzle_diameter", nozzle_diameters_str); // duplicated into config data
} }
// modifies m_silent_time_estimator_enabled // modifies m_silent_time_estimator_enabled

13
src/slic3r/GUI/Plater.cpp
View File

@ -5522,17 +5522,8 @@ void Plater::convert_gcode_to_binary()
// Perform conversion // Perform conversion
{ {
wxBusyCursor busy; wxBusyCursor busy;
// TODO: allow custommization of config const bgcode::base::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config();
bgcode::base::BinarizerConfig config; bgcode::core::EResult res = bgcode::convert::from_ascii_to_binary(*in_file, *out_file, binarizer_config);
config.checksum = bgcode::core::EChecksumType::CRC32;
config.compression.file_metadata = bgcode::core::ECompressionType::None;
config.compression.print_metadata = bgcode::core::ECompressionType::None;
config.compression.printer_metadata = bgcode::core::ECompressionType::None;
config.compression.slicer_metadata = bgcode::core::ECompressionType::Deflate;
config.compression.gcode = bgcode::core::ECompressionType::Heatshrink_12_4;
config.gcode_encoding = bgcode::core::EGCodeEncodingType::MeatPackComments;
config.metadata_encoding = bgcode::core::EMetadataEncodingType::INI;
bgcode::core::EResult res = bgcode::convert::from_ascii_to_binary(*in_file, *out_file, config);
if (res != bgcode::core::EResult::Success) { 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); MessageDialog msg_dlg(this, _L(std::string(bgcode::core::translate_result(res))), _L("Error converting gcode file"), wxICON_INFORMATION | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();