juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: move the message location; disale the AP supporting check

Browse Source 
jira: [none]
Change-Id: I55ea491584c978cc4b22815d582f0cbfe1be1d2a
(cherry picked from commit 196a87431be9a32e9c08b730d3cf991b71ebec12)
This commit is contained in:
xin.zhang
2025-01-17 11:42:59 +08:00
committed by Noisyfox
parent 4356fd3529
commit cd022b5f93
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -1701,7 +1701,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
Enable_Send_Button(false); Enable_Send_Button(false);
Enable_Refresh_Button(true); Enable_Refresh_Button(true);
} else if (status == PrintDialogStatus::PrintStatusAmsOnSettingup) { } else if (status == PrintDialogStatus::PrintStatusAmsOnSettingup) {
update_print_status_msg(_L("AMS is setting up. Please try again later."), false, false); update_print_status_msg(_L("AMS is setting up. Please try again later."), true, false);
Enable_Send_Button(false); Enable_Send_Button(false);
Enable_Refresh_Button(true); Enable_Refresh_Button(true);
} else if (status == PrintDialogStatus::PrintStatusDisableAms) { } else if (status == PrintDialogStatus::PrintStatusDisableAms) {
@@ -1729,12 +1729,12 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
Enable_Refresh_Button(true); Enable_Refresh_Button(true);
} else if (status == PrintDialogStatus::PrintStatusAmsMappingMixInvalid) { } else if (status == PrintDialogStatus::PrintStatusAmsMappingMixInvalid) {
wxString msg_text = _L("Please do not mix-use the Ext with AMS"); wxString msg_text = _L("Please do not mix-use the Ext with AMS");
update_print_status_msg(msg_text, true, false); update_print_status_msg(msg_text, true, true);
Enable_Send_Button(false); Enable_Send_Button(false);
Enable_Refresh_Button(true); Enable_Refresh_Button(true);
} else if (status == PrintDialogStatus::PrintStatusNozzleDataInvalid) { } else if (status == PrintDialogStatus::PrintStatusNozzleDataInvalid) {
wxString msg_text = _L("Invalid nozzle information, please refresh or manually set nozzle information."); wxString msg_text = _L("Invalid nozzle information, please refresh or manually set nozzle information.");
update_print_status_msg(msg_text, true, false); update_print_status_msg(msg_text, true, true);
Enable_Send_Button(false); Enable_Send_Button(false);
Enable_Refresh_Button(true); Enable_Refresh_Button(true);
} else if (status == PrintDialogStatus::PrintStatusNozzleMatchInvalid) { } else if (status == PrintDialogStatus::PrintStatusNozzleMatchInvalid) {
@@ -3322,11 +3322,13 @@ void SelectMachineDialog::update_show_status()
} }
// check ams and vt_slot mix use status // check ams and vt_slot mix use status
#if 0 /*AP is supporting, send the print job and let the device check it*/
if (obj_->is_ams_on_settingup()) if (obj_->is_ams_on_settingup())
{ {
show_status(PrintDialogStatus::PrintStatusAmsOnSettingup); show_status(PrintDialogStatus::PrintStatusAmsOnSettingup);
return; return;
} }
#endif
struct ExtruderStatus struct ExtruderStatus
{ {