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

FIX:fixed issue of import french files failing 

jira:[model mall]

Change-Id: I4cb9bfc0b75484ed6f1a39845c677260c5616019
This commit is contained in:
tao wang 2023-09-20 14:31:51 +08:00 committed by Lane.Wei
parent 2d5e2e1546
commit 9aed4e9273
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI_App.cpp
View File

@ -1039,7 +1039,7 @@ void GUI_App::post_init()
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format("download_url %1%") % download_url; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format("download_url %1%") % download_url;
if (!download_url.empty()) { if (!download_url.empty()) {
m_download_file_url = from_u8(download_url).ToStdString(); m_download_file_url = from_u8(download_url);
} }
} }

2
src/slic3r/GUI/GUI_App.hpp
View File

@ -229,7 +229,7 @@ private:
#endif #endif
//import model from mall //import model from mall
std::string m_download_file_url; wxString m_download_file_url;
//#ifdef _WIN32 //#ifdef _WIN32
wxColour m_color_label_modified; wxColour m_color_label_modified;

39
src/slic3r/GUI/Plater.cpp
View File

@ -37,6 +37,7 @@
#include <wx/popupwin.h> #include <wx/popupwin.h>
#endif #endif
#include <wx/clrpicker.h> #include <wx/clrpicker.h>
#include <wx/tokenzr.h>
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "libslic3r/Format/STL.hpp" #include "libslic3r/Format/STL.hpp"
@ -8219,26 +8220,25 @@ int Plater::save_project(bool saveAs)
//BBS import model by model id //BBS import model by model id
void Plater::import_model_id(wxString download_info) void Plater::import_model_id(wxString download_info)
{ {
//std::string download_origin_url = wxGetApp().url_decode(download_info.ToStdString()); wxString download_origin_url = download_info;
wxString download_url;
std::string download_origin_url = download_info.ToStdString(); wxString filename;
std::string download_url; wxString separator = "&name=";
std::string filename;
try try
{ {
std::vector<std::string> origin_array = wxGetApp().split_str(download_origin_url, "&name="); size_t namePos = download_info.Find(separator);
if (origin_array.size() >= 2) { if (namePos != wxString::npos) {
download_url = download_info.Mid(0, namePos);
filename = download_info.Mid(namePos + separator.Length());
download_url = origin_array[0];
filename = origin_array[1];
} }
else if (!download_origin_url.empty()) { else {
fs::path download_path = fs::path(download_origin_url.wx_str());
fs::path download_path = fs::path(download_origin_url);
download_url = download_origin_url; download_url = download_origin_url;
filename = download_path.filename().string(); filename = download_path.filename().string();
} }
} }
catch (const std::exception& error) catch (const std::exception& error)
{ {
@ -8296,7 +8296,7 @@ void Plater::import_model_id(wxString download_info)
try try
{ {
vecFiles.clear(); vecFiles.clear();
wxString extension = fs::path(filename).extension().c_str(); wxString extension = fs::path(filename.wx_str()).extension().c_str();
auto name = filename.substr(0, filename.length() - extension.length() - 1); auto name = filename.substr(0, filename.length() - extension.length() - 1);
for (const auto& iter : boost::filesystem::directory_iterator(target_path)) for (const auto& iter : boost::filesystem::directory_iterator(target_path))
@ -8319,7 +8319,7 @@ void Plater::import_model_id(wxString download_info)
//update filename //update filename
if (is_already_exist && vecFiles.size() >= 1) { if (is_already_exist && vecFiles.size() >= 1) {
wxString extension = fs::path(filename).extension().c_str(); wxString extension = fs::path(filename.wx_str()).extension().c_str();
wxString name = filename.substr(0, filename.length() - extension.length()); wxString name = filename.substr(0, filename.length() - extension.length());
filename = wxString::Format("%s(%d)%s", name, vecFiles.size() + 1, extension).ToStdString(); filename = wxString::Format("%s(%d)%s", name, vecFiles.size() + 1, extension).ToStdString();
} }
@ -8339,13 +8339,13 @@ void Plater::import_model_id(wxString download_info)
} }
//target_path /= (boost::format("%1%_%2%.3mf") % filename % unique).str(); //target_path /= (boost::format("%1%_%2%.3mf") % filename % unique).str();
target_path /= fs::path(wxString(filename).wc_str()); target_path /= fs::path(filename.wc_str());
fs::path tmp_path = target_path; fs::path tmp_path = target_path;
tmp_path += format(".%1%", ".download"); tmp_path += format(".%1%", ".download");
auto url = download_url;
auto http = Http::get(url); auto http = Http::get(download_url.ToStdString());
while (cont && retry_count < max_retries) { while (cont && retry_count < max_retries) {
retry_count++; retry_count++;
@ -8403,8 +8403,7 @@ void Plater::import_model_id(wxString download_info)
if (download_ok) { if (download_ok) {
BOOST_LOG_TRIVIAL(trace) << "import_model_id: target_path = " << target_path.string(); BOOST_LOG_TRIVIAL(trace) << "import_model_id: target_path = " << target_path.string();
/* load project */ /* load project */
this->load_project(encode_path(target_path.string().c_str())); this->load_project(target_path.wstring());
/*BBS set project info after load project, project info is reset in load project */ /*BBS set project info after load project, project info is reset in load project */
//p->project.project_model_id = model_id; //p->project.project_model_id = model_id;
//p->project.project_design_id = design_id; //p->project.project_design_id = design_id;
@ -8414,7 +8413,7 @@ void Plater::import_model_id(wxString download_info)
} }
// show save new project // show save new project
p->set_project_filename(wxString(filename)); p->set_project_filename(filename);
p->notification_manager->push_import_finished_notification(target_path.string(), target_path.parent_path().string(), false); p->notification_manager->push_import_finished_notification(target_path.string(), target_path.parent_path().string(), false);
} }
else { else {