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

Fixed missing whitespace in GXX lines when unbinarizing using meatpack

Browse Source
This commit is contained in:
enricoturri1966 2023-07-28 14:48:14 +02:00
parent 2cde917f11
commit cc7f2f3aae
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libslic3r/GCode/GCodeBinarizer.cpp
View File

@ -407,18 +407,31 @@ static void unbinarize(const std::vector<uint8_t>& src, std::string& dst) {
} }
} }
auto is_gline_parameter = [](const char c) {
static const std::vector<char> parameters = {
// G0, G1
'X', 'Y', 'Z', 'E', 'F',
// G2, G3
'I', 'J', 'R',
// G29
'P', 'W', 'H', 'C', 'A'
};
return std::find(parameters.begin(), parameters.end(), c) != parameters.end();
};
std::array<char, 2> c_unbin{ 0, 0 }; std::array<char, 2> c_unbin{ 0, 0 };
const size_t char_count = get_result_char(c_unbin); const size_t char_count = get_result_char(c_unbin);
for (size_t i = 0; i < char_count; ++i) { for (size_t i = 0; i < char_count; ++i) {
// GCodeReader::parse_line_internal() is unable to parse a G line where the data are not separated by spaces // GCodeReader::parse_line_internal() is unable to parse a G line where the data are not separated by spaces
// so we add them where needed // so we add them where needed
if (c_unbin[i] == 'G' && std::distance(unbin_buffer.begin(), it_unbin_end) > 0 && *std::prev(it_unbin_end, 1) == '\n') const size_t curr_unbin_buffer_length = std::distance(unbin_buffer.begin(), it_unbin_end);
if (c_unbin[i] == 'G' && (curr_unbin_buffer_length == 0 || *std::prev(it_unbin_end, 1) == '\n'))
add_space = true; add_space = true;
else if (c_unbin[i] == '\n') else if (c_unbin[i] == '\n')
add_space = false; add_space = false;
if (add_space && *std::prev(it_unbin_end, 1) != ' ' && if (add_space && (curr_unbin_buffer_length == 0 || *std::prev(it_unbin_end, 1) != ' ') &&
(c_unbin[i] == 'X' || c_unbin[i] == 'Y' || c_unbin[i] == 'Z' || c_unbin[i] == 'E' || c_unbin[i] == 'F')) { is_gline_parameter(c_unbin[i])) {
*it_unbin_end = ' '; *it_unbin_end = ' ';
++it_unbin_end; ++it_unbin_end;
} }