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

#5098 - Fixed no preview after language change

Browse Source
This commit is contained in:
enricoturri1966 2020-11-09 14:27:00 +01:00
parent 2618992c8b
commit a72fb79f72
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,6 +412,9 @@ void GCodeViewer::refresh(const GCodeProcessor::Result& gcode_result, const std:
void GCodeViewer::reset() void GCodeViewer::reset()
{ {
m_initialized = false;
m_gl_data_initialized = false;
m_moves_count = 0; m_moves_count = 0;
for (TBuffer& buffer : m_buffers) { for (TBuffer& buffer : m_buffers) {
buffer.reset(); buffer.reset();
@ -439,31 +442,25 @@ void GCodeViewer::reset()
void GCodeViewer::render() const void GCodeViewer::render() const
{ {
auto init_gl_data = [this]() { auto init_gl_data = [this]() {
static bool first_run = true;
if (first_run) {
// initializes opengl data of TBuffers // initializes opengl data of TBuffers
for (size_t i = 0; i < m_buffers.size(); ++i) { for (size_t i = 0; i < m_buffers.size(); ++i) {
TBuffer& buffer = m_buffers[i]; TBuffer& buffer = m_buffers[i];
switch (buffer_type(i)) switch (buffer_type(i)) {
{
default: { break; } default: { break; }
case EMoveType::Tool_change: case EMoveType::Tool_change:
case EMoveType::Color_change: case EMoveType::Color_change:
case EMoveType::Pause_Print: case EMoveType::Pause_Print:
case EMoveType::Custom_GCode: case EMoveType::Custom_GCode:
case EMoveType::Retract: case EMoveType::Retract:
case EMoveType::Unretract: case EMoveType::Unretract: {
{
buffer.shader = wxGetApp().is_glsl_version_greater_or_equal_to(1, 20) ? "options_120" : "options_110"; buffer.shader = wxGetApp().is_glsl_version_greater_or_equal_to(1, 20) ? "options_120" : "options_110";
break; break;
} }
case EMoveType::Extrude: case EMoveType::Extrude: {
{
buffer.shader = "gouraud_light"; buffer.shader = "gouraud_light";
break; break;
} }
case EMoveType::Travel: case EMoveType::Travel: {
{
buffer.shader = "toolpaths_lines"; buffer.shader = "toolpaths_lines";
break; break;
} }
@ -477,8 +474,7 @@ void GCodeViewer::render() const
std::array<int, 2> point_sizes; std::array<int, 2> point_sizes;
::glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, point_sizes.data()); ::glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, point_sizes.data());
m_detected_point_sizes = { static_cast<float>(point_sizes[0]), static_cast<float>(point_sizes[1]) }; m_detected_point_sizes = { static_cast<float>(point_sizes[0]), static_cast<float>(point_sizes[1]) };
first_run = false; m_gl_data_initialized = true;
}
}; };
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
@ -487,6 +483,7 @@ void GCodeViewer::render() const
// OpenGL data must be initialized after the glContext has been created. // OpenGL data must be initialized after the glContext has been created.
// This is ensured when this method is called by GLCanvas3D::_render_gcode(). // This is ensured when this method is called by GLCanvas3D::_render_gcode().
if (!m_gl_data_initialized)
init_gl_data(); init_gl_data();
if (m_roles.empty()) if (m_roles.empty())

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

@ -388,6 +388,7 @@ public:
private: private:
bool m_initialized{ false }; bool m_initialized{ false };
mutable bool m_gl_data_initialized{ false };
unsigned int m_last_result_id{ 0 }; unsigned int m_last_result_id{ 0 };
size_t m_moves_count{ 0 }; size_t m_moves_count{ 0 };
mutable std::vector<TBuffer> m_buffers{ static_cast<size_t>(EMoveType::Extrude) }; mutable std::vector<TBuffer> m_buffers{ static_cast<size_t>(EMoveType::Extrude) };