3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-21 20:12:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: auto filament map does not consider vt slot

Browse source 
when it has ams
jira:none

Change-Id: Id101a17375059a3aabc8e35d08352cd394a894e6
(cherry picked from commit 14ceceb3d73c0a5e02c7b9cd748978f847fdf03e)
This commit is contained in:
zhimin.zeng 2024-09-27 14:57:24 +08:00 • committed by Noisyfox
parent 8bfe3a818c
commit 454002d65c
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1060,8 +1060,8 @@ bool SelectMachineDialog::do_ams_mapping(MachineObject *obj_)
int filament_result = 0;
std::vector<bool> map_opt; //four values: use_left_ams, use_right_ams, use_left_ext, use_right_ext
if (nozzle_nums > 1){
//get nozzle property, the nozzles are same?
if (!can_hybrid_mapping(obj_->m_extder_data)){
//get nozzle property, the extders are same?
if (true/*!can_hybrid_mapping(obj_->m_extder_data)*/){
std::vector<FilamentInfo> m_ams_mapping_result_left, m_ams_mapping_result_right;
std::vector<FilamentInfo> m_filament_left, m_filament_right;
for (auto it = m_filaments.begin(); it != m_filaments.end(); it++){
@ -1075,9 +1075,29 @@ bool SelectMachineDialog::do_ams_mapping(MachineObject *obj_)
else if (m_filaments_map[it->id] == 2)
m_filament_right.push_back(*it);
}
map_opt = {true, false, true, false}; //four values: use_left_ams, use_right_ams, use_left_ext, use_right_ext
bool has_left_ams = false, has_right_ams = false;
for (auto ams_item : obj_->amsList) {
if (ams_item.second->nozzle == 0) {
if (obj_->is_main_extruder_on_left())
has_left_ams = true;
else
has_right_ams = true;
}
else if (ams_item.second->nozzle == 1) {
if (obj_->is_main_extruder_on_left())
has_right_ams = true;
else
has_left_ams = true;
}
if (has_left_ams && has_right_ams)
break;
}
map_opt = {true, false, !has_left_ams, false}; //four values: use_left_ams, use_right_ams, use_left_ext, use_right_ext
int result_first = obj_->ams_filament_mapping(m_filament_left, m_ams_mapping_result_left, map_opt);
map_opt = { false, true, false, true };
map_opt = { false, true, false, !has_right_ams };
int result_second = obj_->ams_filament_mapping(m_filament_right, m_ams_mapping_result_right, map_opt);
//m_ams_mapping_result.clear();