From f94e94f53e7e252272893bd82edeb485373bfabd Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Tue, 3 Nov 2020 09:27:18 +0100
Subject: [PATCH] GCode tool marker set as visible by default
---
src/slic3r/GUI/GCodeViewer.cpp | 6 ++++--
src/slic3r/GUI/GCodeViewer.hpp | 2 +-
src/slic3r/GUI/GUI_Preview.cpp | 12 ++++++------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 9c653813c..ed5431d19 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -493,8 +493,10 @@ void GCodeViewer::render() const
glsafe(::glEnable(GL_DEPTH_TEST));
render_toolpaths();
- m_sequential_view.marker.set_world_position(m_sequential_view.current_position);
- m_sequential_view.marker.render();
+ if (m_sequential_view.current.last != m_sequential_view.endpoints.last) {
+ m_sequential_view.marker.set_world_position(m_sequential_view.current_position);
+ m_sequential_view.marker.render();
+ }
render_shells();
render_legend();
#if ENABLE_GCODE_VIEWER_STATISTICS
diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp
index 1cf538584..e6a010cc8 100644
--- a/src/slic3r/GUI/GCodeViewer.hpp
+++ b/src/slic3r/GUI/GCodeViewer.hpp
@@ -343,7 +343,7 @@ public:
Transform3f m_world_transform;
float m_z_offset{ 0.5f };
std::array<float, 4> m_color{ 1.0f, 1.0f, 1.0f, 0.5f };
- bool m_visible{ false };
+ bool m_visible{ true };
public:
void init();
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index 69be62ca0..2e67eb23d 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -325,16 +325,16 @@ bool Preview::init(wxWindow* parent, Model* model)
get_option_type_string(OptionType::PausePrints) + "|0|" +
get_option_type_string(OptionType::CustomGCodes) + "|0|" +
get_option_type_string(OptionType::Shells) + "|0|" +
- get_option_type_string(OptionType::ToolMarker) + "|0|" +
+ get_option_type_string(OptionType::ToolMarker) + "|1|" +
get_option_type_string(OptionType::Legend) + "|1"
);
Slic3r::GUI::create_combochecklist(m_combochecklist_options, GUI::into_u8(_L("Options")), options_items);
#else
- m_checkbox_travel = new wxCheckBox(this, wxID_ANY, _(L("Travel")));
- m_checkbox_retractions = new wxCheckBox(this, wxID_ANY, _(L("Retractions")));
- m_checkbox_unretractions = new wxCheckBox(this, wxID_ANY, _(L("Deretractions")));
- m_checkbox_shells = new wxCheckBox(this, wxID_ANY, _(L("Shells")));
- m_checkbox_legend = new wxCheckBox(this, wxID_ANY, _(L("Legend")));
+ m_checkbox_travel = new wxCheckBox(this, wxID_ANY, _L("Travel"));
+ m_checkbox_retractions = new wxCheckBox(this, wxID_ANY, _L("Retractions"));
+ m_checkbox_unretractions = new wxCheckBox(this, wxID_ANY, _L("Deretractions"));
+ m_checkbox_shells = new wxCheckBox(this, wxID_ANY, _L("Shells"));
+ m_checkbox_legend = new wxCheckBox(this, wxID_ANY, _L("Legend"));
m_checkbox_legend->SetValue(true);
#endif // ENABLE_GCODE_VIEWER