3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCodeProcessor -> Extract toolpaths width from gcode moves

Browse Source
This commit is contained in:
enricoturri1966 2020-08-17 10:54:41 +02:00
parent 7f33300e3d
commit 5b579aee9a
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -755,6 +755,7 @@ void GCodeProcessor::process_file(const std::string& filename)
m_time_processor.post_process(filename); m_time_processor.post_process(filename);
#if ENABLE_GCODE_VIEWER_DATA_CHECKING #if ENABLE_GCODE_VIEWER_DATA_CHECKING
std::cout << "\n";
m_mm3_per_mm_compare.output(); m_mm3_per_mm_compare.output();
m_height_compare.output(); m_height_compare.output();
m_width_compare.output(); m_width_compare.output();
@ -1403,18 +1404,24 @@ void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line)
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
m_extruded_last_z = m_end_position[Z]; m_extruded_last_z = m_end_position[Z];
} }
if (m_extrusion_role == erExternalPerimeter)
// cross section: rectangle
m_width = round_to_nearest(delta_pos[E] * static_cast<float>(M_PI * sqr(1.05 * filament_radius)) / (d_xyz * m_height), 3);
else if (m_extrusion_role == erBridgeInfill || m_extrusion_role == erNone)
// cross section: circle
m_width = round_to_nearest(static_cast<float>(m_filament_diameters[m_extruder_id]) * std::sqrt(delta_pos[E] / d_xyz), 3);
else
// cross section: rectangle + 2 semicircles
m_width = round_to_nearest(delta_pos[E] * static_cast<float>(M_PI * sqr(filament_radius)) / (d_xyz * m_height) + static_cast<float>(1.0 - 0.25 * M_PI) * m_height, 3);
#if ENABLE_GCODE_VIEWER_DATA_CHECKING
m_width_compare.update(m_width, m_extrusion_role);
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
} }
if (type == EMoveType::Extrude && (m_width == 0.0f || m_height == 0.0f)) { if (type == EMoveType::Extrude && (m_extrusion_role == erCustom || m_width == 0.0f || m_height == 0.0f))
if ((m_width == 0.0f && m_height == 0.0f) || m_extrusion_role == erCustom) type = EMoveType::Travel;
type = EMoveType::Travel;
else {
if (m_width == 0.0f)
m_width = 0.5f;
if (m_height == 0.0f)
m_height = 0.5f;
}
}
// time estimate section // time estimate section
auto move_length = [](const AxisCoords& delta_pos) { auto move_length = [](const AxisCoords& delta_pos) {