3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-04 13:57:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

FIX: disable multi-color with ext when ams enable

Browse source 
Jira: [STUDIO-13290]
Change-Id: I36f83a90959ba759e0616afe7b515dbd716b1020
(cherry picked from commit 5a4ec1f3a4175a927c37cea1577e6b276daa0f3c)
This commit is contained in:
hemai 2025-07-09 19:27:03 +08:00 • committed by Noisyfox
parent 1472b5ce21
commit cd5566aee5
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2266,8 +2266,32 @@ void SelectMachineDialog::update_option_opts(MachineObject *obj)
update_options_layout();
}
static bool _HasExt(const std::vector<FilamentInfo> &ams_mapping_result) {
if (ams_mapping_result.empty()) {
return true;
};
for (const auto &info : ams_mapping_result) {
if (info.ams_id == VIRTUAL_AMS_MAIN_ID_STR || info.ams_id == VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
return true;
}
}
return false;
}
static bool _HasAms(const std::vector<FilamentInfo> &ams_mapping_result) {
for (const auto &info : ams_mapping_result) {
if (info.ams_id != VIRTUAL_AMS_MAIN_ID_STR && info.ams_id != VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
return true;
}
}
return false;
}
bool SelectMachineDialog::is_enable_external_change_assist(std::vector<FilamentInfo>& ams_mapping_result) {
if (m_print_job && m_print_job->task_use_ams) return false;
if (_HasAms(ams_mapping_result)) return false;
std::map<std::string, int> v_ams_map;
v_ams_map[VIRTUAL_AMS_MAIN_ID_STR] = 0;
@ -2339,30 +2363,6 @@ void SelectMachineDialog::Enable_Auto_Refill(bool enable)
m_ams_backup_tip->Refresh();
}
static bool _HasExt(const std::vector<FilamentInfo> &ams_mapping_result) {
if (ams_mapping_result.empty()) {
return true;
};
for (const auto &info : ams_mapping_result) {
if (info.ams_id == VIRTUAL_AMS_MAIN_ID_STR || info.ams_id == VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
return true;
}
}
return false;
}
static bool _HasAms(const std::vector<FilamentInfo> &ams_mapping_result) {
for (const auto &info : ams_mapping_result) {
if (info.ams_id != VIRTUAL_AMS_MAIN_ID_STR && info.ams_id != VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
return true;
}
}
return false;
}
void SelectMachineDialog::on_send_print()
{
BOOST_LOG_TRIVIAL(info) << "print_job: on_ok to send";