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

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
enricoturri1966 2021-09-06 14:38:21 +02:00
commit b60a0fe3d3
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2252,8 +2252,14 @@ void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line)
// cross section: rectangle + 2 semicircles // cross section: rectangle + 2 semicircles
m_width = delta_pos[E] * static_cast<float>(M_PI * sqr(filament_radius)) / (delta_xyz * m_height) + static_cast<float>(1.0 - 0.25 * M_PI) * m_height; m_width = delta_pos[E] * static_cast<float>(M_PI * sqr(filament_radius)) / (delta_xyz * m_height) + static_cast<float>(1.0 - 0.25 * M_PI) * m_height;
#if ENABLE_CLAMP_TOOLPATHS_WIDTH
if (m_producers_enabled && m_producer != EProducer::PrusaSlicer)
// clamp width to avoid artifacts which may arise from wrong values of m_height // clamp width to avoid artifacts which may arise from wrong values of m_height
m_width = std::min(m_width, std::max(1.0f, 4.0f * m_height)); m_width = std::min(m_width, std::max(1.0f, 4.0f * m_height));
#else
// clamp width to avoid artifacts which may arise from wrong values of m_height
m_width = std::min(m_width, std::max(1.0f, 4.0f * m_height));
#endif // ENABLE_CLAMP_TOOLPATHS_WIDTH
#if ENABLE_GCODE_VIEWER_DATA_CHECKING #if ENABLE_GCODE_VIEWER_DATA_CHECKING
m_width_compare.update(m_width, m_extrusion_role); m_width_compare.update(m_width, m_extrusion_role);

2
src/libslic3r/Technologies.hpp
View File

@ -62,6 +62,8 @@
//==================== //====================
#define ENABLE_2_4_0_ALPHA2 1 #define ENABLE_2_4_0_ALPHA2 1
// Enable clamping toolpaths width only for gcodes files produced by 3rd part softwares
#define ENABLE_CLAMP_TOOLPATHS_WIDTH (1 && ENABLE_2_4_0_ALPHA2)
// Enable coloring of toolpaths in preview by layer time // Enable coloring of toolpaths in preview by layer time
#define ENABLE_PREVIEW_LAYER_TIME (1 && ENABLE_2_4_0_ALPHA2) #define ENABLE_PREVIEW_LAYER_TIME (1 && ENABLE_2_4_0_ALPHA2)

2
src/slic3r/GUI/GCodeViewer.cpp
View File

@ -2434,7 +2434,7 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
buffer.model.instances.render_ranges.reset(); buffer.model.instances.render_ranges.reset();
if (!buffer.visible) if (!buffer.visible || buffer.model.instances.s_ids.empty())
continue; continue;
buffer.model.instances.render_ranges.ranges.push_back({ 0, 0, 0, buffer.model.color }); buffer.model.instances.render_ranges.ranges.push_back({ 0, 0, 0, buffer.model.color });