mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix the print_seq not display issue 

the by_object setting is in plate
previous judge logic doesn't handle it

Change-Id: I7e32c9a6decc0797f7098e9e4c53ab53d17c072e
(cherry picked from commit 3c712001239002eb1b5c79e291069ed424f8141a)
This commit is contained in:
lane.wei 2023-05-23 10:53:18 +08:00 committed by Lane.Wei
parent 7c5e96a43a
commit bda8d1cb98
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -748,7 +748,7 @@ void GLCanvas3D::Labels::render(const std::vector<const ModelInstance*>& sorted_
} }
// updates print order strings // updates print order strings
if (sorted_instances.size() > 1) { if (sorted_instances.size() > 0) {
for (size_t i = 0; i < sorted_instances.size(); ++i) { for (size_t i = 0; i < sorted_instances.size(); ++i) {
size_t id = sorted_instances[i]->id().id; size_t id = sorted_instances[i]->id().id;
std::vector<Owner>::iterator it = std::find_if(owners.begin(), owners.end(), [id](const Owner& owner) { std::vector<Owner>::iterator it = std::find_if(owners.begin(), owners.end(), [id](const Owner& owner) {
@ -7068,8 +7068,9 @@ void GLCanvas3D::_render_overlays()
if (m_layers_editing.last_object_id >= 0 && m_layers_editing.object_max_z() > 0.0f) if (m_layers_editing.last_object_id >= 0 && m_layers_editing.object_max_z() > 0.0f)
m_layers_editing.render_overlay(*this); m_layers_editing.render_overlay(*this);
const ConfigOptionEnum<PrintSequence>* opt = dynamic_cast<const ConfigOptionEnum<PrintSequence>*>(m_config->option<ConfigOptionEnum<PrintSequence>>("print_sequence")); auto curr_plate = wxGetApp().plater()->get_partplate_list().get_curr_plate();
bool sequential_print = opt != nullptr && (opt->value == PrintSequence::ByObject); auto curr_print_seq = curr_plate->get_real_print_seq();
bool sequential_print = (curr_print_seq == PrintSequence::ByObject);
std::vector<const ModelInstance*> sorted_instances; std::vector<const ModelInstance*> sorted_instances;
if (sequential_print) { if (sequential_print) {
const Print* print = fff_print(); const Print* print = fff_print();