3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX:optimize the process of loading/unloading p1p printers

Browse source 
Change-Id: Ib1b83aceca9753a6d6086c0b159da015d705f86a
This commit is contained in:
tao wang 2023-05-29 16:31:08 +08:00 • committed by Lane.Wei
parent 12d0a51362
commit a476bbd229
2 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,19 @@ static std::vector<std::string> message_containing_retry{
"0701 8006", "0701 8006",
"0701 8006", "0701 8006",
"0701 8007", "0701 8007",
"0700 8012",
"0701 8012",
"0702 8012",
"0703 8012",
"07FF 8003",
"07FF 8004",
"07FF 8005",
"07FF 8006",
"07FF 8007",
"07FF 8010",
"07FF 8011",
"07FF 8012",
"07FF 8013",
}; };
/* size */ /* size */
@ -1732,8 +1745,8 @@ void StatusPanel::update_error_message()
wxString error_msg = wxGetApp().get_hms_query()->query_print_error_msg(obj->print_error); wxString error_msg = wxGetApp().get_hms_query()->query_print_error_msg(obj->print_error);
if (!error_msg.IsEmpty()) { if (!error_msg.IsEmpty()) {
auto time = wxDateTime::Now(); wxDateTime now = wxDateTime::Now();
auto show_time = time.Format("%H%M%S"); wxString show_time = now.Format("%H:%M:%S");
error_msg = wxString::Format("%s[%s %s]", error_msg = wxString::Format("%s[%s %s]",
error_msg, error_msg,
print_error_str, show_time); print_error_str, show_time);
@ -2269,6 +2282,17 @@ void StatusPanel::update_ams_control_state(bool is_support_virtual_tray, bool is
enable[ACTION_BTN_UNLOAD] = false; enable[ACTION_BTN_UNLOAD] = false;
} }
if (obj->ams_exist_bits == 0) {
if (obj->is_in_printing() && !obj->can_resume()) {
enable[ACTION_BTN_LOAD] = false;
enable[ACTION_BTN_UNLOAD] = false;
}
else {
enable[ACTION_BTN_LOAD] = true;
enable[ACTION_BTN_UNLOAD] = true;
}
}
// if (obj->m_tray_now == "255") { // if (obj->m_tray_now == "255") {
// enable[ACTION_BTN_UNLOAD] = false; // enable[ACTION_BTN_UNLOAD] = false;
// } // }

4
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -2519,8 +2519,8 @@ void AMSControl::UpdateStepCtrl(bool is_extrusion)
wxString VT_TRAY_LOAD_STEP_STRING[VT_LOAD_STEP_COUNT] = { wxString VT_TRAY_LOAD_STEP_STRING[VT_LOAD_STEP_COUNT] = {
_L("Heat the nozzle"), _L("Heat the nozzle"),
_L("Feed new filament from external spool"), _L("Push new filament into the extruder"),
_L("Confirm whether the filament has been extruded"), _L("Grab new filament"),
_L("Purge old filament"), _L("Purge old filament"),
}; };