diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index d738b4d3de..32553b4b0f 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1731,7 +1731,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectorvalues[item.id]; - if (chamber_temp >= obj_->chamber_temp_switch_heat) {// check close door + if (chamber_temp >= obj_->chamber_temp_switch_heat) {// check close door show_status(PrintDialogStatus::PrintStatusFilamentWarningHighChamberTempCloseDoor); if (PrePrintChecker::is_error(PrintDialogStatus::PrintStatusFilamentWarningHighChamberTempCloseDoor)) { return; } } diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index 5a64738ac4..dc38db98ec 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -310,6 +310,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater) OutputDebugStringA(std::to_string(i).c_str()); OutputDebugStringA("\n");*/ m_file_sys->Retry(); + wxLogMessage(_L("click to retry")); } }); @@ -768,6 +769,8 @@ void SendToPrinterDialog::on_cancel(wxCloseEvent &event) m_task_timer->Stop(); m_task_timer.reset(); } + m_file_sys->Stop(true); + m_file_sys.reset(); } m_tcp_try_connect = true; m_tutk_try_connect = false; @@ -1232,6 +1235,7 @@ void SendToPrinterDialog::update_show_status() if (!agent) return; if (!dev) return; MachineObject* obj_ = dev->get_my_machine(m_printer_last_select); + if (!obj_) { if (agent) { if (agent->is_user_login()) { @@ -1241,6 +1245,9 @@ void SendToPrinterDialog::update_show_status() return; } + + + /* check cloud machine connections */ if (!obj_->is_lan_mode_printer()) { if (!agent->is_server_connected()) { @@ -1250,7 +1257,7 @@ void SendToPrinterDialog::update_show_status() } } - if (!obj_->is_info_ready()) { + if (!obj_->is_info_ready() || !obj_->is_online() || !obj_->is_connected()) { if (is_timeout()) { show_status(PrintDialogStatus::PrintStatusReadingTimeout); return; @@ -1302,7 +1309,7 @@ void SendToPrinterDialog::update_show_status() m_file_sys->Stop(true); m_file_sys.reset(); } - BOOST_LOG_TRIVIAL(info) << "m_ftp_try_connect is" << m_ftp_try_connect; + BOOST_LOG_TRIVIAL(info) << "m_ftp_try_connect is ok" << m_ftp_try_connect; // add log show_status(PrintDialogStatus::PrintStatusReadingFinished); @@ -1375,13 +1382,14 @@ void SendToPrinterDialog::update_show_status() m_tutk_try_connect = false; } } - BOOST_LOG_TRIVIAL(info) << "connect failed" ; - BOOST_LOG_TRIVIAL(info) << "m_ftp_try_connect is " << m_ftp_try_connect; - BOOST_LOG_TRIVIAL(info) << "m_tutk_try_connect is " << m_tutk_try_connect ; - BOOST_LOG_TRIVIAL(info) << "m_tcp_try_connect is " << m_tcp_try_connect; + BOOST_LOG_TRIVIAL(info) << "connect failed" ; + BOOST_LOG_TRIVIAL(info) << "m_ftp_try_connect1 is " << m_ftp_try_connect; + BOOST_LOG_TRIVIAL(info) << "m_tutk_try_connect1 is " << m_tutk_try_connect ; + BOOST_LOG_TRIVIAL(info) << "m_tcp_try_connect1 is " << m_tcp_try_connect; } else msg = _L("Please check the network and try again, You can restart or update the printer if the issue persists."); + fs->Stop(); m_connect_try_times++; BOOST_LOG_TRIVIAL(info) << "m_connect_try_times is " << m_connect_try_times; @@ -1567,7 +1575,7 @@ void SendToPrinterDialog::show_status(PrintDialogStatus status, std::vector