juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:Fixed printer name display error

Browse Source 
jira:[STUDIO-8619]

Change-Id: Ie9ce0cb39623eefa3973a342b447ab2f2a765d28
(cherry picked from commit c41eb657818bb29abb3a2e7c6df7b7d489c80592)
This commit is contained in:
tao wang
2024-11-05 20:35:31 +08:00
committed by Noisyfox
parent 00d274fc29
commit 818948af53
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -5999,9 +5999,9 @@ std::vector<std::string> DeviceManager::get_compatible_machine(std::string type_
return compatible_machine;
}
std::vector<std::string> DeviceManager::get_all_model_id()
boost::bimaps::bimap<std::string, std::string> DeviceManager::get_all_model_id_with_name()
{
std::vector<std::string> models;
boost::bimaps::bimap<std::string, std::string> models;
std::vector<wxString> m_files;
wxDir dir(Slic3r::resources_dir() + "/printers/");
@@ -6026,8 +6026,14 @@ std::vector<std::string> DeviceManager::get_all_model_id()
json_file >> jj;
if (jj.contains("00.00.00.00")) {
json const &printer = jj["00.00.00.00"];
if (printer.contains("model_id")) {
for (auto res : printer["model_id"]) models.emplace_back(res.get<std::string>());
std::string model_id;
std::string display_name;
if (printer.contains("model_id")) {model_id = printer["model_id"].get<std::string>();}
if (printer.contains("display_name")) {display_name = printer["display_name"].get<std::string>();}
if (!model_id.empty() && !display_name.empty()) {
models.left.insert(make_pair(model_id, display_name));
}
}
}