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

GCodeViewer -> Extrusion toolpaths colored by width

Browse Source
This commit is contained in:
enricoturri1966 2020-04-20 13:24:25 +02:00
parent 6e5a6f3b43
commit aee80dbd01
3 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Technologies.hpp
View File

@ -58,7 +58,7 @@
// Enable G-Code viewer // Enable G-Code viewer
#define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1) #define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1)
#define ENABLE_GCODE_VIEWER_DEBUG_OUTPUT (1 && ENABLE_GCODE_VIEWER) #define ENABLE_GCODE_VIEWER_DEBUG_OUTPUT (0 && ENABLE_GCODE_VIEWER)
#endif // _prusaslicer_technologies_h_ #endif // _prusaslicer_technologies_h_

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

@ -59,10 +59,10 @@ bool GCodeViewer::IBuffer::init_shader(const std::string& vertex_shader_src, con
return true; return true;
} }
void GCodeViewer::IBuffer::add_path(GCodeProcessor::EMoveType type, ExtrusionRole role, float height) void GCodeViewer::IBuffer::add_path(const GCodeProcessor::MoveVertex& move)
{ {
unsigned int id = static_cast<unsigned int>(data.size()); unsigned int id = static_cast<unsigned int>(data.size());
paths.push_back({ type, role, id, id, height }); paths.push_back({ move.type, move.extrusion_role, id, id, move.height, move.width });
} }
std::array<float, 4> GCodeViewer::Extrusions::Range::get_color_at(float value, const std::array<std::array<float, 4>, Default_Range_Colors_Count>& colors) const std::array<float, 4> GCodeViewer::Extrusions::Range::get_color_at(float value, const std::array<std::array<float, 4>, Default_Range_Colors_Count>& colors) const
@ -74,8 +74,8 @@ std::array<float, 4> GCodeViewer::Extrusions::Range::get_color_at(float value, c
const size_t color_max_idx = colors.size() - 1; const size_t color_max_idx = colors.size() - 1;
// Compute the two colors just below (low) and above (high) the input value // Compute the two colors just below (low) and above (high) the input value
const size_t color_low_idx = std::clamp(static_cast<std::size_t>(global_t), std::size_t{ 0 }, color_max_idx); const size_t color_low_idx = std::clamp<size_t>(static_cast<size_t>(global_t), 0, color_max_idx);
const size_t color_high_idx = std::clamp(color_low_idx + 1, std::size_t{ 0 }, color_max_idx); const size_t color_high_idx = std::clamp<size_t>(color_low_idx + 1, 0, color_max_idx);
// Compute how far the value is between the low and high colors so that they can be interpolated // Compute how far the value is between the low and high colors so that they can be interpolated
const float local_t = std::min(global_t - static_cast<float>(color_low_idx), 1.0f); // upper limit of 1.0f const float local_t = std::min(global_t - static_cast<float>(color_low_idx), 1.0f); // upper limit of 1.0f
@ -279,7 +279,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
case GCodeProcessor::EMoveType::Retract: case GCodeProcessor::EMoveType::Retract:
case GCodeProcessor::EMoveType::Unretract: case GCodeProcessor::EMoveType::Unretract:
{ {
buffer.add_path(curr.type, curr.extrusion_role, curr.height); buffer.add_path(curr);
buffer.data.push_back(static_cast<unsigned int>(i)); buffer.data.push_back(static_cast<unsigned int>(i));
break; break;
} }
@ -288,12 +288,13 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
{ {
if (prev.type != curr.type || !buffer.paths.back().matches(curr)) if (prev.type != curr.type || !buffer.paths.back().matches(curr))
{ {
buffer.add_path(curr.type, curr.extrusion_role, curr.height); buffer.add_path(curr);
buffer.data.push_back(static_cast<unsigned int>(i - 1)); buffer.data.push_back(static_cast<unsigned int>(i - 1));
if (curr.type == GCodeProcessor::EMoveType::Extrude) if (curr.type == GCodeProcessor::EMoveType::Extrude)
{ {
m_extrusions.ranges.height.update_from(curr.height); m_extrusions.ranges.height.update_from(curr.height);
m_extrusions.ranges.width.update_from(curr.width);
} }
} }
@ -412,17 +413,9 @@ void GCodeViewer::render_toolpaths() const
std::array<float, 4> color; std::array<float, 4> color;
switch (m_view_type) switch (m_view_type)
{ {
case EViewType::FeatureType: case EViewType::FeatureType: { color = m_extrusions.role_colors[static_cast<unsigned int>(path.role)]; break; }
{ case EViewType::Height: { color = m_extrusions.ranges.height.get_color_at(path.height, m_extrusions.ranges.colors); break; }
color = m_extrusions.role_colors[static_cast<unsigned int>(path.role)]; case EViewType::Width: { color = m_extrusions.ranges.width.get_color_at(path.width, m_extrusions.ranges.colors); break; }
break;
}
case EViewType::Height:
{
color = m_extrusions.ranges.height.get_color_at(path.height, m_extrusions.ranges.colors);
break;
}
case EViewType::Width:
case EViewType::Feedrate: case EViewType::Feedrate:
case EViewType::FanSpeed: case EViewType::FanSpeed:
case EViewType::VolumetricRate: case EViewType::VolumetricRate:
@ -575,6 +568,32 @@ void GCodeViewer::render_overlay() const
ImDrawList* draw_list = ImGui::GetWindowDrawList(); ImDrawList* draw_list = ImGui::GetWindowDrawList();
auto add_range = [this, draw_list, &imgui](const Extrusions::Range& range) {
auto add_item = [this, draw_list, &imgui](int i, float value) {
ImVec2 pos(ImGui::GetCursorPosX() + 2.0f, ImGui::GetCursorPosY() + 2.0f);
draw_list->AddRect(ImVec2(pos.x, pos.y), ImVec2(pos.x + ICON_BORDER_SIZE, pos.y + ICON_BORDER_SIZE), ICON_BORDER_COLOR, 0.0f, 0);
const std::array<float, 4>& color = m_extrusions.ranges.colors[i];
ImU32 fill_color = ImGui::GetColorU32(ImVec4(color[0], color[1], color[2], color[3]));
draw_list->AddRectFilled(ImVec2(pos.x + 1.0f, pos.y + 1.0f), ImVec2(pos.x + ICON_BORDER_SIZE - 1.0f, pos.y + ICON_BORDER_SIZE - 1.0f), fill_color);
ImGui::SetCursorPosX(pos.x + ICON_BORDER_SIZE + GAP_ICON_TEXT);
ImGui::AlignTextToFramePadding();
char buf[1024];
::sprintf(buf, "%.*f", 3, value);
imgui.text(buf);
};
float step_size = range.step_size();
if (step_size == 0.0f)
add_item(0, range.min);
else
{
for (int i = Default_Range_Colors_Count - 1; i >= 0; --i)
{
add_item(i, range.min + static_cast<float>(i) * step_size);
}
}
};
ImGui::PushStyleColor(ImGuiCol_Text, ORANGE); ImGui::PushStyleColor(ImGuiCol_Text, ORANGE);
switch (m_view_type) switch (m_view_type)
{ {
@ -610,24 +629,14 @@ void GCodeViewer::render_overlay() const
} }
case EViewType::Height: case EViewType::Height:
{ {
float step_size = m_extrusions.ranges.height.step_size(); add_range(m_extrusions.ranges.height);
for (int i = Default_Range_Colors_Count - 1; i >= 0; --i) break;
{ }
ImVec2 pos(ImGui::GetCursorPosX() + 2.0f, ImGui::GetCursorPosY() + 2.0f); case EViewType::Width:
draw_list->AddRect(ImVec2(pos.x, pos.y), ImVec2(pos.x + ICON_BORDER_SIZE, pos.y + ICON_BORDER_SIZE), ICON_BORDER_COLOR, 0.0f, 0); {
const std::array<float, 4>& color = m_extrusions.ranges.colors[i]; add_range(m_extrusions.ranges.width);
ImU32 fill_color = ImGui::GetColorU32(ImVec4(color[0], color[1], color[2], color[3]));
draw_list->AddRectFilled(ImVec2(pos.x + 1.0f, pos.y + 1.0f), ImVec2(pos.x + ICON_BORDER_SIZE - 1.0f, pos.y + ICON_BORDER_SIZE - 1.0f), fill_color);
ImGui::SetCursorPosX(pos.x + ICON_BORDER_SIZE + GAP_ICON_TEXT);
ImGui::AlignTextToFramePadding();
char buf[1024];
::sprintf(buf, "%.*f", 3, m_extrusions.ranges.height.min + static_cast<float>(i) * step_size);
imgui.text(buf);
}
break; break;
} }
case EViewType::Width: { break; }
case EViewType::Feedrate: { break; } case EViewType::Feedrate: { break; }
case EViewType::FanSpeed: { break; } case EViewType::FanSpeed: { break; }
case EViewType::VolumetricRate: { break; } case EViewType::VolumetricRate: { break; }

15
src/slic3r/GUI/GCodeViewer.hpp
View File

@ -41,8 +41,11 @@ class GCodeViewer
unsigned int first{ 0 }; unsigned int first{ 0 };
unsigned int last{ 0 }; unsigned int last{ 0 };
float height{ 0.0f }; float height{ 0.0f };
float width{ 0.0f };
bool matches(const GCodeProcessor::MoveVertex& move) const { return type == move.type && role == move.extrusion_role && height == move.height; } bool matches(const GCodeProcessor::MoveVertex& move) const {
return type == move.type && role == move.extrusion_role && height == move.height && width == move.width;
}
}; };
// buffer containing indices data and shader for a specific toolpath type // buffer containing indices data and shader for a specific toolpath type
@ -57,8 +60,7 @@ class GCodeViewer
void reset(); void reset();
bool init_shader(const std::string& vertex_shader_src, const std::string& fragment_shader_src); bool init_shader(const std::string& vertex_shader_src, const std::string& fragment_shader_src);
void add_path(const GCodeProcessor::MoveVertex& move);
void add_path(GCodeProcessor::EMoveType type, ExtrusionRole role, float height);
}; };
struct Shells struct Shells
@ -90,7 +92,7 @@ class GCodeViewer
max = -FLT_MAX; max = -FLT_MAX;
} }
float step_size() const { return (max - min) / static_cast<float>(Default_Range_Colors_Count); } float step_size() const { return (max - min) / (static_cast<float>(Default_Range_Colors_Count) - 1.0f); }
std::array<float, 4> get_color_at(float value, const std::array<std::array<float, 4>, Default_Range_Colors_Count>& colors) const; std::array<float, 4> get_color_at(float value, const std::array<std::array<float, 4>, Default_Range_Colors_Count>& colors) const;
}; };
@ -100,8 +102,8 @@ class GCodeViewer
// Color mapping by layer height. // Color mapping by layer height.
Range height; Range height;
// // Color mapping by extrusion width. // Color mapping by extrusion width.
// Range width; Range width;
// // Color mapping by feedrate. // // Color mapping by feedrate.
// MultiRange<FeedrateKind> feedrate; // MultiRange<FeedrateKind> feedrate;
// // Color mapping by fan speed. // // Color mapping by fan speed.
@ -111,6 +113,7 @@ class GCodeViewer
void reset() { void reset() {
height.reset(); height.reset();
width.reset();
} }
}; };