From 6e97750dcd120d9a7504982c9778463d22ce4ed6 Mon Sep 17 00:00:00 2001 From: tao wang Date: Thu, 16 Nov 2023 10:58:44 +0800 Subject: [PATCH] ENH:fixed incorrect path prefix jira:[for file path prefix] Change-Id: Ie9e3999f02b78272e528ceceb479e746d46a7e6c --- src/slic3r/GUI/MediaFilePanel.cpp | 8 +++++++- src/slic3r/GUI/SelectMachine.cpp | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index dd68bd46b5..821be622ca 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -526,7 +526,13 @@ void MediaFilePanel::doAction(size_t index, int action) auto &file = fs->GetFile(index); - int gcode_file_count = Slic3r::GUI::wxGetApp().plater()->update_print_required_data(config, model, plate_data_list, from_u8(file.name).ToStdString(), file.path); + + std::string file_path = file.path; + if (!file_path.empty() && file_path[0] == '/') { + file_path.erase(0, 1); + } + + int gcode_file_count = Slic3r::GUI::wxGetApp().plater()->update_print_required_data(config, model, plate_data_list, file.name, file_path); if (gcode_file_count > 0) { wxPostEvent(Slic3r::GUI::wxGetApp().plater(), SimpleEvent(EVT_PRINT_FROM_SDCARD_VIEW)); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index f2df65a278..454ce39aa9 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2768,11 +2768,11 @@ void SelectMachineDialog::on_send_print() if (input_str_arr.size() <= 1) { input_str_arr = wxGetApp().split_str(m_required_data_file_name, ".3mf"); if (input_str_arr.size() > 1) { - m_print_job->set_project_name(wxString(input_str_arr[0]).utf8_string()); + m_print_job->set_project_name(input_str_arr[0]); } } else { - m_print_job->set_project_name(wxString(input_str_arr[0]).utf8_string()); + m_print_job->set_project_name(input_str_arr[0]); } }