3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-24 14:16:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ENH: CLI: only check filament conflicts before slicing when there is one color

Browse source 
jira: no-jira
Change-Id: I17fc917b624578491170656372e4c4d1b43f0412
(cherry picked from commit 53a551174e682694374e539572e5337791e0a7d8)
This commit is contained in:
lane.wei 2025-03-10 15:35:55 +08:00 • committed by Noisyfox
parent 5550d23354
commit 5b9e4a4862
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/OrcaSlicer.cpp
View file

@ -5314,6 +5314,13 @@ int CLI::run(int argc, char **argv)
else if (i->print_volume_state == ModelInstancePVS_Inside)
{
const Transform3d& inst_matrix = i->get_transformation().get_matrix();
//get object filaments
std::set<int> object_filaments;
for (const ModelVolume *vol : model_object->volumes) {
std::vector<int> filaments = vol->get_extruders();
object_filaments.insert(filaments.begin(), filaments.end());
}
for (const ModelVolume* vol : model_object->volumes)
{
if (vol->is_model_part()) {
@ -5332,10 +5339,13 @@ int CLI::run(int argc, char **argv)
std::vector<bool> inside_extruders;
BuildVolume::ObjectState state = build_volume.check_volume_bbox_state_with_extruder_areas(bbox, inside_extruders);
if (state == BuildVolume::ObjectState::Limited) {
for (size_t i = 0; i < inside_extruders.size(); ++i) {
if (!inside_extruders[i]) {
std::vector<int> filaments = vol->get_extruders();
unprintable_filament_ids[i].insert(filaments.begin(), filaments.end());
if (object_filaments.size() == 1) {
// Only check for single-color object
for (size_t j = 0; j < inside_extruders.size(); ++j) {
if (!inside_extruders[j]) {
std::vector<int> filaments = vol->get_extruders();
unprintable_filament_ids[j].insert(filaments.begin(), filaments.end());
}
}
}
}