Fixed debug export of gcode data to be configuration indipendent

This commit is contained in:
enricoturri1966 2024-02-21 10:16:59 +01:00 committed by Lukas Matena
parent 2b825ce8a7
commit 04d916a351
2 changed files with 74 additions and 74 deletions

View File

@ -921,8 +921,8 @@ void GCodeViewer::load_as_gcode(const GCodeProcessorResult& gcode_result, const
//
// FilePtr out{ boost::nowide::fopen("C:/prusa/slicer/test_output/spe1872/test.data", "wb") };
// if (out.f != nullptr) {
// const size_t vertices_count = data.vertices.size();
// fwrite((void*)&vertices_count, 1, sizeof(size_t), out.f);
// const uint32_t vertices_count = static_cast<uint32_t>(data.vertices.size());
// fwrite((void*)&vertices_count, 1, sizeof(uint32_t), out.f);
// for (const libvgcode::PathVertex& v : data.vertices) {
// fwrite((void*)&v.position[0], 1, sizeof(float), out.f);
// fwrite((void*)&v.position[1], 1, sizeof(float), out.f);
@ -953,16 +953,16 @@ void GCodeViewer::load_as_gcode(const GCodeProcessorResult& gcode_result, const
// const uint8_t spiral_vase_mode = data.spiral_vase_mode ? 1 : 0;
// fwrite((void*)&spiral_vase_mode, 1, sizeof(uint8_t), out.f);
//
// const size_t tool_colors_count = data.tools_colors.size();
// fwrite((void*)&tool_colors_count, 1, sizeof(size_t), out.f);
// const uint32_t tool_colors_count = static_cast<uint32_t>(data.tools_colors.size());
// fwrite((void*)&tool_colors_count, 1, sizeof(uint32_t), out.f);
// for (const libvgcode::Color& c : data.tools_colors) {
// fwrite((void*)&c[0], 1, sizeof(uint8_t), out.f);
// fwrite((void*)&c[1], 1, sizeof(uint8_t), out.f);
// fwrite((void*)&c[2], 1, sizeof(uint8_t), out.f);
// }
//
// const size_t color_print_colors_count = data.color_print_colors.size();
// fwrite((void*)&color_print_colors_count, 1, sizeof(size_t), out.f);
// const uint32_t color_print_colors_count = static_cast<uint32_t>(data.color_print_colors.size());
// fwrite((void*)&color_print_colors_count, 1, sizeof(uint32_t), out.f);
// for (const libvgcode::Color& c : data.color_print_colors) {
// fwrite((void*)&c[0], 1, sizeof(uint8_t), out.f);
// fwrite((void*)&c[1], 1, sizeof(uint8_t), out.f);

View File

@ -838,7 +838,7 @@ void Preview::load_print_as_fff(bool keep_z_range)
const unsigned int number_extruders = wxGetApp().is_editor() ?
(unsigned int)print->extruders().size() : m_canvas->get_gcode_extruders_count();
const bool contains_color_gcodes = std::any_of(std::begin(color_print_values), std::end(color_print_values),
[](auto const& item) { return item.type == CustomGCode::Type::ColorChange; });
[](auto const& item) { return item.type == CustomGCode::Type::ColorChange || item.type == CustomGCode::Type::ToolChange; });
const libvgcode::EViewType choice = contains_color_gcodes ?
libvgcode::EViewType::ColorPrint :
(number_extruders > 1) ? libvgcode::EViewType::Tool : libvgcode::EViewType::FeatureType;