mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-12-11 16:00:17 -07:00
ENH:allows the user to enter a printed IP address
Change-Id: I9d2617d0dd42f53e93d61e98bcf3cc97979a93f6 (cherry picked from commit 24ab56f8568e9637634e97a0632309cfd2762749)
This commit is contained in:
parent
c8df45c11f
commit
47a46010bd
9 changed files with 253 additions and 10 deletions
|
|
@ -309,12 +309,16 @@ void SendJob::process()
|
|||
msg_text += wxString::Format("[%s]", error_text);
|
||||
}
|
||||
}
|
||||
|
||||
if (result == BAMBU_NETWORK_ERR_WRONG_IP_ADDRESS) {
|
||||
msg_text = _L("Failed uploading print file. Please enter ip address again.");
|
||||
m_enter_ip_address_fun();
|
||||
}
|
||||
|
||||
update_status(curr_percent, msg_text);
|
||||
BOOST_LOG_TRIVIAL(error) << "send_job: failed, result = " << result;
|
||||
} else {
|
||||
BOOST_LOG_TRIVIAL(error) << "send_job: send ok.";
|
||||
//m_success_fun();
|
||||
wxCommandEvent* evt = new wxCommandEvent(m_print_job_completed_id);
|
||||
evt->SetString(from_u8(params.project_name));
|
||||
wxQueueEvent(m_plater, evt);
|
||||
|
|
@ -327,6 +331,12 @@ void SendJob::on_success(std::function<void()> success)
|
|||
m_success_fun = success;
|
||||
}
|
||||
|
||||
void SendJob::on_enter_ip_address(std::function<void()> success)
|
||||
{
|
||||
m_enter_ip_address_fun = success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void SendJob::finalize() {
|
||||
if (was_canceled()) return;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ class SendJob : public PlaterJob
|
|||
bool m_job_finished{ false };
|
||||
int m_print_job_completed_id = 0;
|
||||
std::function<void()> m_success_fun{nullptr};
|
||||
std::function<void()> m_enter_ip_address_fun{nullptr};
|
||||
|
||||
protected:
|
||||
|
||||
|
|
@ -52,6 +53,7 @@ public:
|
|||
bool is_finished() { return m_job_finished; }
|
||||
void process() override;
|
||||
void on_success(std::function<void()> success);
|
||||
void on_enter_ip_address(std::function<void()> success);
|
||||
void finalize() override;
|
||||
void set_project_name(std::string name);
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue