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

Small refactoring in GCodeViewer

Browse source
This commit is contained in:
enricoturri1966 2020-10-08 11:21:27 +02:00
parent ecff5893d6
commit 8a99e2b237
2 changed files with 8 additions and 8 deletions

8
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -1633,10 +1633,10 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
for (size_t i = 0; i < buffer.paths.size(); ++i) { for (size_t i = 0; i < buffer.paths.size(); ++i) {
const Path& path = buffer.paths[i]; const Path& path = buffer.paths[i];
if (path.type == EMoveType::Travel) { if (path.type == EMoveType::Travel) {
if (!is_travel_in_z_range(i)) if (!is_travel_in_z_range(i, m_layers_z_range[0], m_layers_z_range[1]))
continue; continue;
} }
else if (!is_in_z_range(path)) else if (!is_in_z_range(path, m_layers_z_range[0], m_layers_z_range[1]))
continue; continue;
if (path.type == EMoveType::Extrude && !is_visible(path)) if (path.type == EMoveType::Extrude && !is_visible(path))
@ -2613,7 +2613,7 @@ void GCodeViewer::render_statistics() const
} }
#endif // ENABLE_GCODE_VIEWER_STATISTICS #endif // ENABLE_GCODE_VIEWER_STATISTICS
bool GCodeViewer::is_travel_in_z_range(size_t id) const bool GCodeViewer::is_travel_in_z_range(size_t id, double min_z, double max_z) const
{ {
const TBuffer& buffer = m_buffers[buffer_id(EMoveType::Travel)]; const TBuffer& buffer = m_buffers[buffer_id(EMoveType::Travel)];
if (id >= buffer.paths.size()) if (id >= buffer.paths.size())
@ -2633,7 +2633,7 @@ bool GCodeViewer::is_travel_in_z_range(size_t id) const
path.last = buffer.paths[last].last; path.last = buffer.paths[last].last;
} }
return is_in_z_range(path); return is_in_z_range(path, min_z, max_z);
} }
void GCodeViewer::log_memory_used(const std::string& label, long long additional) const void GCodeViewer::log_memory_used(const std::string& label, long long additional) const

8
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -468,14 +468,14 @@ private:
return role < erCount && (m_extrusions.role_visibility_flags & (1 << role)) != 0; return role < erCount && (m_extrusions.role_visibility_flags & (1 << role)) != 0;
} }
bool is_visible(const Path& path) const { return is_visible(path.role); } bool is_visible(const Path& path) const { return is_visible(path.role); }
bool is_in_z_range(const Path& path) const { bool is_in_z_range(const Path& path, double min_z, double max_z) const {
auto in_z_range = [this](double z) { auto in_z_range = [this, min_z, max_z](double z) {
return z > m_layers_z_range[0] - EPSILON && z < m_layers_z_range[1] + EPSILON; return z > min_z - EPSILON && z < max_z + EPSILON;
}; };
return in_z_range(path.first.position[2]) || in_z_range(path.last.position[2]); return in_z_range(path.first.position[2]) || in_z_range(path.last.position[2]);
} }
bool is_travel_in_z_range(size_t id) const; bool is_travel_in_z_range(size_t id, double min_z, double max_z) const;
void log_memory_used(const std::string& label, long long additional = 0) const; void log_memory_used(const std::string& label, long long additional = 0) const;
}; };