diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index a037c0c483..0740ffb415 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1146,29 +1146,27 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato } // 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)); // config data - binary_data.slicer_metadata.encoding_type = (uint16_t)bgcode::core::EMetadataEncodingType::INI; encode_full_config(print, binary_data.slicer_metadata.raw_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; for (size_t i = 0; i < print.config().filament_type.values.size(); ++i) { filament_types_str += print.config().filament_type.values[i]; if (i < print.config().filament_type.values.size() - 1) 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; char buf[1024]; 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]); 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 diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 691a597362..e0c1527e84 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5522,17 +5522,8 @@ void Plater::convert_gcode_to_binary() // Perform conversion { wxBusyCursor busy; - // TODO: allow custommization of config - bgcode::base::BinarizerConfig 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); + const bgcode::base::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config(); + bgcode::core::EResult res = bgcode::convert::from_ascii_to_binary(*in_file, *out_file, 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); msg_dlg.ShowModal();