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

Follow-up to 84de301:

Browse Source 
- Fixed updating of model when printers are switched
- Fixed needless updates of model when seq printing is disabled (introduced in 8e5f5e1)
This commit is contained in:
Lukas Matena 2025-02-13 12:53:40 +01:00
parent 8180bea835
commit 075ff32718
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,29 +217,21 @@ int GCodeViewer::SequentialView::ActualSpeedImguiWidget::plot(const char* label,
} }
#endif // ENABLE_ACTUAL_SPEED_DEBUG #endif // ENABLE_ACTUAL_SPEED_DEBUG
bool GCodeViewer::SequentialView::Marker::init(std::optional<std::unique_ptr<GLModel>>& model_opt) void GCodeViewer::SequentialView::Marker::init(std::optional<std::unique_ptr<GLModel>>& model_opt)
{ {
if (! model_opt.has_value()) if (! model_opt.has_value())
return false; return;
if (m_generic_marker != (model_opt->get() == nullptr)) m_model.reset();
m_model.reset();
m_generic_marker = (model_opt->get() == nullptr);
m_generic_marker = (model_opt->get() == nullptr); if (m_generic_marker)
bool ret = false; m_model.init_from(stilized_arrow(16, 2.0f, 4.0f, 1.0f, 8.0f));
if (!m_model.is_initialized()) { else
if (m_generic_marker) m_model = **model_opt;
m_model.init_from(stilized_arrow(16, 2.0f, 4.0f, 1.0f, 8.0f));
else { m_model.set_color({ 1.0f, 1.0f, 1.0f, 0.5f });
m_model = **model_opt; }
model_opt.reset();
}
ret = true;
}
m_model.set_color({ 1.0f, 1.0f, 1.0f, 0.5f });
return ret;
}
void GCodeViewer::SequentialView::Marker::render() void GCodeViewer::SequentialView::Marker::render()
{ {
@ -1213,7 +1205,8 @@ void GCodeViewer::render()
// Following just makes sure that the shown marker is correct. // Following just makes sure that the shown marker is correct.
auto marker_model_opt = wxGetApp().plater()->get_current_canvas3D()->get_current_marker_model(); auto marker_model_opt = wxGetApp().plater()->get_current_canvas3D()->get_current_marker_model();
if (m_sequential_view.marker.init(marker_model_opt)) m_sequential_view.marker.init(marker_model_opt);
if (marker_model_opt.has_value())
m_max_bounding_box.reset(); m_max_bounding_box.reset();
m_sequential_view.render(legend_height, &m_viewer, curr_vertex.gcode_id); m_sequential_view.render(legend_height, &m_viewer, curr_vertex.gcode_id);

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

@ -133,7 +133,7 @@ public:
#endif // ENABLE_ACTUAL_SPEED_DEBUG #endif // ENABLE_ACTUAL_SPEED_DEBUG
public: public:
bool init(std::optional<std::unique_ptr<GLModel>>& model_opt); void init(std::optional<std::unique_ptr<GLModel>>& model_opt);
const BoundingBoxf3& get_bounding_box() const { return m_model.get_bounding_box(); } const BoundingBoxf3& get_bounding_box() const { return m_model.get_bounding_box(); }

9
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -177,6 +177,11 @@ std::optional<std::unique_ptr<GLModel>> GLCanvas3D::get_current_marker_model() c
bool seq = m_config->opt_bool("complete_objects"); bool seq = m_config->opt_bool("complete_objects");
if (last_printer_notes != printer_notes || r != old_r || h != old_h || seq != old_seq) { if (last_printer_notes != printer_notes || r != old_r || h != old_h || seq != old_seq) {
last_printer_notes = printer_notes;
old_r = r;
old_h = h;
old_seq = seq;
out = std::make_optional(nullptr); out = std::make_optional(nullptr);
if (! seq) if (! seq)
return out; return out;
@ -212,10 +217,6 @@ std::optional<std::unique_ptr<GLModel>> GLCanvas3D::get_current_marker_model() c
m->init_from(mesh); m->init_from(mesh);
out = std::make_optional(std::move(m)); out = std::make_optional(std::move(m));
} }
last_printer_notes = printer_notes;
old_r = r;
old_h = h;
old_seq = seq;
} }
return out; return out;
} }