mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:limit the length of taskname 

Change-Id: Iddac0f5a88f1090562862a5cd1aa72e321272c71
This commit is contained in:
tao wang 2023-06-15 14:15:41 +08:00 committed by Lane.Wei
parent 23b4230335
commit 68c894981c
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/GUI/Jobs/PrintJob.cpp
View File

@ -63,6 +63,19 @@ void PrintJob::on_success(std::function<void()> success)
m_success_fun = success; m_success_fun = success;
} }
std::string PrintJob::truncate_string(const std::string& str, size_t maxLength)
{
if (str.length() <= maxLength)
{
return str;
}
std::string truncatedStr = str.substr(0, maxLength - 3);
truncatedStr.append("...");
return truncatedStr;
}
wxString PrintJob::get_http_error_msg(unsigned int status, std::string body) wxString PrintJob::get_http_error_msg(unsigned int status, std::string body)
{ {
try { try {
@ -153,8 +166,7 @@ void PrintJob::process()
} }
} }
// task name m_project_name = truncate_string(m_project_name, 100);
std::string project_name = wxGetApp().plater()->get_project_name().ToUTF8().data();
int curr_plate_idx = 0; int curr_plate_idx = 0;
if (m_print_type == "from_normal") { if (m_print_type == "from_normal") {
@ -208,7 +220,6 @@ void PrintJob::process()
params.dev_id = m_dev_id; params.dev_id = m_dev_id;
params.ftp_folder = m_ftp_folder; params.ftp_folder = m_ftp_folder;
//params.project_name = m_project_name;
params.filename = job_data._3mf_path.string(); params.filename = job_data._3mf_path.string();
@ -264,11 +275,6 @@ void PrintJob::process()
if (params.preset_name.empty()) { params.preset_name = wxString::Format("%s_plate_%d", m_project_name, curr_plate_idx).ToStdString(); } if (params.preset_name.empty()) { params.preset_name = wxString::Format("%s_plate_%d", m_project_name, curr_plate_idx).ToStdString(); }
if (params.project_name.empty()) {params.project_name = m_project_name;} if (params.project_name.empty()) {params.project_name = m_project_name;}
//Prevent string length from exceeding 100 bytes
if (params.project_name.size() >= 100) {
params.project_name = params.project_name.substr(0, 99);
}
wxString error_text; wxString error_text;
wxString msg_text; wxString msg_text;

5
src/slic3r/GUI/Jobs/PrintJob.hpp
View File

@ -91,15 +91,16 @@ public:
bool is_finished() { return m_job_finished; } bool is_finished() { return m_job_finished; }
void set_print_job_finished_event(int event_id) { m_print_job_completed_id = event_id; } void set_print_job_finished_event(int event_id) { m_print_job_completed_id = event_id; }
void on_success(std::function<void()> success); void on_success(std::function<void()> success);
wxString get_http_error_msg(unsigned int status, std::string body);
void process() override; void process() override;
void finalize() override; void finalize() override;
void set_project_name(std::string name); void set_project_name(std::string name);
void on_check_ip_address_fail(std::function<void()> func); void on_check_ip_address_fail(std::function<void()> func);
void on_check_ip_address_success(std::function<void()> func); void on_check_ip_address_success(std::function<void()> func);
void connect_to_local_mqtt(); void connect_to_local_mqtt();
wxString get_http_error_msg(unsigned int status, std::string body);
std::string truncate_string(const std::string& str, size_t maxLength);
}; };
}} // namespace Slic3r::GUI }} // namespace Slic3r::GUI