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

FIX: auto arranging of bed switching was wrong due to locked plates 

jira: STUDIO-11140, STUDIO-10891, STUDIO-11002, STUDIO-11221
Change-Id: Iaead21849aa45a5ebdb9b2a5ff8189d17a1a7a67
This commit is contained in:
Arthur 2025-03-31 11:57:54 +08:00 committed by lane.wei
parent 61204671b0
commit 6a84d0abbf
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/slic3r/GUI/Jobs/ArrangeJob.cpp
View File

@ -96,7 +96,6 @@ void ArrangeJob::clear_input()
m_unselected.clear();
m_unprintable.clear();
m_locked.clear();
m_unarranged.clear();
m_uncompatible_plates.clear();
m_selected.reserve(count + 1 /* for optional wti */);
m_unselected.reserve(count + 1 /* for optional wti */);
@ -473,6 +472,7 @@ void ArrangeJob::prepare_outside_plate() {
//}
}
std::set<int> locked_plates;
for (int obj_idx = 0; obj_idx < model.objects.size(); obj_idx++) {
ModelObject *object = model.objects[obj_idx];
for (size_t inst_idx = 0; inst_idx < object->instances.size(); ++inst_idx) {
@ -486,7 +486,10 @@ void ArrangeJob::prepare_outside_plate() {
continue;
} else {
int plate_idx = iter1->second;
if (plate_list.get_plate(plate_idx)->is_locked()) { plate_locked = plate_list.get_plate(plate_idx); }
if (plate_list.get_plate(plate_idx)->is_locked()) {
plate_locked = plate_list.get_plate(plate_idx);
locked_plates.insert(plate_idx);
}
}
if (iter2 != all_outside_objects.end()) {
outside_plate = true;
@ -504,6 +507,20 @@ void ArrangeJob::prepare_outside_plate() {
}
}
if (!locked_plates.empty()) {
std::sort(m_unselected.begin(), m_unselected.end(), [](auto &ap1, auto &ap2) { return ap1.bed_idx < ap2.bed_idx; });
for (auto &ap : m_unselected) {
int locked_plate_count = 0;
for (auto &plate_idx : locked_plates) {
if (plate_idx < ap.bed_idx)
locked_plate_count++;
else
break;
}
ap.bed_idx -= locked_plate_count;
}
}
prepare_wipe_tower(true);
// add the virtual object into unselect list if has
@ -753,6 +770,8 @@ void ArrangeJob::finalize()
plate_list.postprocess_arrange_polygon(ap, false);
ap.apply();
ARRANGE_LOG(debug) << boost::format(": locked %4%: bed_id %1%, trans {%2%, %3%}") % ap.bed_idx % unscale<double>(ap.translation(X)) %
unscale<double>(ap.translation(Y)) % ap.name;
}
// Apply the arrange result to all selected objects
@ -772,6 +791,8 @@ void ArrangeJob::finalize()
plate_list.postprocess_arrange_polygon(ap, false);
ap.apply();
ARRANGE_LOG(debug) << boost::format(": unselected %4%: bed_id %1%, trans {%2%, %3%}") % ap.bed_idx % unscale<double>(ap.translation(X)) %
unscale<double>(ap.translation(Y)) % ap.name;
}
// Move the unprintable items to the last virtual bed.
@ -785,18 +806,6 @@ void ArrangeJob::finalize()
}
m_plater->update();
// BBS
//wxGetApp().obj_manipul()->set_dirty();
if (!m_unarranged.empty()) {
std::set<std::string> names;
for (ModelInstance* mi : m_unarranged)
names.insert(mi->get_object()->name);
m_plater->get_notification_manager()->push_notification(GUI::format(
_L("Arrangement ignored the following objects which can't fit into a single bed:\n%s"),
concat_strings(names, "\n")));
}
// unlock the plates we just locked
for (int i : m_uncompatible_plates) {

1
src/slic3r/GUI/Jobs/ArrangeJob.hpp
View File

@ -19,7 +19,6 @@ class ArrangeJob : public PlaterJob
//BBS: add locked logic
ArrangePolygons m_selected, m_unselected, m_unprintable, m_locked;
std::vector<ModelInstance*> m_unarranged;
std::map<int, ArrangePolygons> m_selected_groups; // groups of selected items for sequential printing
std::vector<int> m_uncompatible_plates; // plate indices with different printing sequence than global

2
src/slic3r/GUI/PartPlate.cpp
View File

@ -4848,7 +4848,7 @@ bool PartPlateList::preprocess_arrange_polygon(int obj_index, int instance_index
arrange_polygon.translation(Y) += scaled<double>(plate_stride_y() * arrange_polygon.row);
}
}
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": obj_id %1% instance_id %2% already in plate %3%, locked %4%, row %5%, col %6%\n") % obj_index % instance_index % i % locked % arrange_polygon.row % arrange_polygon.col;
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": obj_id %1% name %7% instance_id %2% already in plate %3%, locked %4%, row %5%, col %6%\n") % obj_index % instance_index % i % locked % arrange_polygon.row % arrange_polygon.col % arrange_polygon.name;
return locked;
}
if (m_plate_list[i]->is_locked())