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

GCodeViewer -> Show tool marker position when enabled

Browse source
This commit is contained in:
enricoturri1966 2020-06-09 08:12:51 +02:00
parent 9f94f89808
commit d358fe85fa
2 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,8 +146,9 @@ void GCodeViewer::SequentialView::Marker::init()
} }
void GCodeViewer::SequentialView::Marker::set_world_position(const Vec3f& position) void GCodeViewer::SequentialView::Marker::set_world_position(const Vec3f& position)
{ {
m_world_transform = (Geometry::assemble_transform(position.cast<double>()) * Geometry::assemble_transform(m_model.get_bounding_box().size()[2] * Vec3d::UnitZ(), { M_PI, 0.0, 0.0 })).cast<float>(); m_world_position = position;
m_world_transform = (Geometry::assemble_transform((position + m_z_offset * Vec3f::UnitZ()).cast<double>()) * Geometry::assemble_transform(m_model.get_bounding_box().size()[2] * Vec3d::UnitZ(), { M_PI, 0.0, 0.0 })).cast<float>();
m_world_bounding_box = m_model.get_bounding_box().transformed(m_world_transform.cast<double>()); m_world_bounding_box = m_model.get_bounding_box().transformed(m_world_transform.cast<double>());
} }
@ -176,6 +177,37 @@ void GCodeViewer::SequentialView::Marker::render() const
shader->stop_using(); shader->stop_using();
glsafe(::glDisable(GL_BLEND)); glsafe(::glDisable(GL_BLEND));
static float last_window_width = 0.0f;
static size_t last_text_length = 0;
static const ImVec4 ORANGE(1.0f, 0.49f, 0.22f, 1.0f);
ImGuiWrapper& imgui = *wxGetApp().imgui();
Size cnv_size = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size();
imgui.set_next_window_pos(static_cast<float>(cnv_size.get_width()), static_cast<float>(cnv_size.get_height()), ImGuiCond_Always, 1.0f, 1.0f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
ImGui::SetNextWindowBgAlpha(0.25f);
imgui.begin(std::string("ToolPosition"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove);
ImGui::PushStyleColor(ImGuiCol_Text, ORANGE);
imgui.text(_u8L("Tool position") + ":");
ImGui::PopStyleColor();
ImGui::SameLine();
char buf[1024];
sprintf(buf, "X: %.2f, Y: %.2f, Z: %.2f", m_world_position(0), m_world_position(1), m_world_position(2));
imgui.text(std::string(buf));
// force extra frame to automatically update window size
float width = ImGui::GetWindowWidth();
size_t length = strlen(buf);
if (width != last_window_width || length != last_text_length) {
last_window_width = width;
last_text_length = length;
wxGetApp().plater()->get_current_canvas3D()->set_as_dirty();
wxGetApp().plater()->get_current_canvas3D()->request_extra_frame();
}
imgui.end();
ImGui::PopStyleVar();
} }
const std::vector<GCodeViewer::Color> GCodeViewer::Extrusion_Role_Colors {{ const std::vector<GCodeViewer::Color> GCodeViewer::Extrusion_Role_Colors {{
@ -353,7 +385,7 @@ void GCodeViewer::render() const
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));
render_toolpaths(); render_toolpaths();
m_sequential_view.marker.set_world_position(m_sequential_view.current_position + m_sequential_view_marker_z_offset * Vec3f::UnitZ()); m_sequential_view.marker.set_world_position(m_sequential_view.current_position);
m_sequential_view.marker.render(); m_sequential_view.marker.render();
render_shells(); render_shells();
render_legend(); render_legend();

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

@ -218,8 +218,10 @@ public:
class Marker class Marker
{ {
GLModel m_model; GLModel m_model;
Vec3f m_world_position;
Transform3f m_world_transform; Transform3f m_world_transform;
BoundingBoxf3 m_world_bounding_box; BoundingBoxf3 m_world_bounding_box;
float m_z_offset{ 0.5f };
std::array<float, 4> m_color{ 1.0f, 1.0f, 1.0f, 1.0f }; std::array<float, 4> m_color{ 1.0f, 1.0f, 1.0f, 1.0f };
bool m_visible{ false }; bool m_visible{ false };
@ -274,7 +276,6 @@ private:
std::vector<unsigned char> m_extruder_ids; std::vector<unsigned char> m_extruder_ids;
mutable Extrusions m_extrusions; mutable Extrusions m_extrusions;
mutable SequentialView m_sequential_view; mutable SequentialView m_sequential_view;
float m_sequential_view_marker_z_offset{ 0.5f };
Shells m_shells; Shells m_shells;
EViewType m_view_type{ EViewType::FeatureType }; EViewType m_view_type{ EViewType::FeatureType };
bool m_legend_enabled{ true }; bool m_legend_enabled{ true };