3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 15:37:30 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: ambiguous call _check_convertible_to_path_source(const wxCStrData&) (#1597)

Browse source 
* fix: ambiguous call _check_convertible_to_path_source(const wxCStrData&)

* change to ToStdWstring() per discussion

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
ovlach 2023-07-30 03:46:50 +02:00 • committed by GitHub
parent 2dfb4f1a68
commit a329497f49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/Auxiliary.cpp
View file

@ -349,7 +349,7 @@ void AuFile::on_input_enter(wxCommandEvent &evt)
wxString new_fullname_path = dir.wstring() + "/" + new_fullname; wxString new_fullname_path = dir.wstring() + "/" + new_fullname;
fs::path new_dir_path(new_fullname_path.c_str()); fs::path new_dir_path(new_fullname_path.ToStdWstring());
if (fs::exists(new_dir_path)) existing = true; if (fs::exists(new_dir_path)) existing = true;
@ -465,7 +465,7 @@ void AuFile::on_set_cover()
auto full_root_path_str = encode_path(full_root_path.string().c_str()); auto full_root_path_str = encode_path(full_root_path.string().c_str());
auto dir = wxString::Format("%s/.thumbnails", full_root_path_str); auto dir = wxString::Format("%s/.thumbnails", full_root_path_str);
fs::path dir_path(dir.c_str()); fs::path dir_path(dir.ToStdWstring());
if (!fs::exists(dir_path)) { if (!fs::exists(dir_path)) {
fs::create_directory(dir_path); fs::create_directory(dir_path);
@ -509,7 +509,7 @@ void AuFile::on_set_delete()
auto full_root_path = full_path.branch_path(); auto full_root_path = full_path.branch_path();
auto full_root_path_str = encode_path(full_root_path.string().c_str()); auto full_root_path_str = encode_path(full_root_path.string().c_str());
auto dir = wxString::Format("%s/.thumbnails", full_root_path_str); auto dir = wxString::Format("%s/.thumbnails", full_root_path_str);
fs::path dir_path(dir.c_str()); fs::path dir_path(dir.ToStdWstring());
auto cover_img_path = dir_path.string() + "/thumbnail_3mf.png"; auto cover_img_path = dir_path.string() + "/thumbnail_3mf.png";
auto small_img_path = dir_path.string() + "/thumbnail_small.png"; auto small_img_path = dir_path.string() + "/thumbnail_small.png";
@ -774,7 +774,7 @@ AuxiliaryPanel::AuxiliaryPanel(wxWindow *parent, wxWindowID id, const wxPoint &p
auto list = iter->second; auto list = iter->second;
for (auto i = 0; i < list.size(); i++) { for (auto i = 0; i < list.size(); i++) {
if (list[i].wstring() == old_name) { if (list[i].wstring() == old_name) {
list[i] = fs::path(new_name.c_str()); list[i] = fs::path(new_name.ToStdWstring());
break; break;
} }
} }
@ -952,7 +952,7 @@ void AuxiliaryPanel::on_import_file(wxCommandEvent &event)
// add in file list // add in file list
iter = m_paths_list.find(file_model.ToStdString()); iter = m_paths_list.find(file_model.ToStdString());
auto file_fs_path = fs::path(dir_path.c_str()); auto file_fs_path = fs::path(dir_path.ToStdWstring());
if (iter != m_paths_list.end()) { if (iter != m_paths_list.end()) {
m_paths_list[file_model.ToStdString()].push_back(file_fs_path); m_paths_list[file_model.ToStdString()].push_back(file_fs_path);
} else { } else {
@ -1032,7 +1032,7 @@ void AuxiliaryPanel::Reload(wxString aux_path)
auto idx = file_path.find(folder.ToStdString()); auto idx = file_path.find(folder.ToStdString());
if (idx != std::string::npos) { if (idx != std::string::npos) {
auto iter = m_paths_list.find(folder.ToStdString()); auto iter = m_paths_list.find(folder.ToStdString());
auto file_path_str = fs::path(file_path.c_str()); auto file_path_str = fs::path(file_path.ToStdWstring());
if (iter != m_paths_list.end()) { if (iter != m_paths_list.end()) {
m_paths_list[folder.ToStdString()].push_back(file_path_str); m_paths_list[folder.ToStdString()].push_back(file_path_str);

2
src/slic3r/GUI/AuxiliaryDataViewModel.hpp
View file

@ -32,7 +32,7 @@ public:
m_container = is_container; m_container = is_container;
m_root = false; m_root = false;
path = abs_path; path = abs_path;
fs::path path_obj(path.c_str()); boost::filesystem::path path_obj(path.ToStdWstring());
name = path_obj.filename().generic_wstring(); name = path_obj.filename().generic_wstring();
parent->Append(this); parent->Append(this);

2
src/slic3r/GUI/SelectMachine.cpp
View file

@ -3069,7 +3069,7 @@ void SelectMachineDialog::set_default()
filename = m_plater->get_export_gcode_filename("", true); filename = m_plater->get_export_gcode_filename("", true);
} }
fs::path filename_path(filename.c_str()); fs::path filename_path(filename.ToStdWstring());
m_current_project_name = wxString::FromUTF8(filename_path.filename().string()); m_current_project_name = wxString::FromUTF8(filename_path.filename().string());
m_rename_text->SetLabelText(m_current_project_name); m_rename_text->SetLabelText(m_current_project_name);
m_rename_normal_panel->Layout(); m_rename_normal_panel->Layout();

4
src/slic3r/GUI/SendToPrinter.cpp
View file

@ -1123,7 +1123,7 @@ void SendToPrinterDialog::set_default()
} }
} }
fs::path filename_path(filename.c_str()); fs::path filename_path(filename.ToStdWstring());
m_current_project_name = wxString::FromUTF8(filename_path.filename().string()); m_current_project_name = wxString::FromUTF8(filename_path.filename().string());
m_rename_text->SetLabelText(m_current_project_name); m_rename_text->SetLabelText(m_current_project_name);
m_rename_normal_panel->Layout(); m_rename_normal_panel->Layout();
@ -1238,4 +1238,4 @@ SendToPrinterDialog::~SendToPrinterDialog()
} }
} }
} }