3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-24 00:28:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Filament selection screen works with renamed filaments

Browse source
This commit is contained in:
Noisyfox 2025-04-15 23:12:52 +08:00
parent 34b91f0283
commit 002fee2f57
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/WebGuideDialog.cpp
View file

@ -1137,10 +1137,25 @@ int GuideFrame::SaveProfileData()
for (auto it = m_ProfileJson["filament"].begin(); it != m_ProfileJson["filament"].end(); ++it) {
//json temp_filament = it.value();
std::string filament_name = it.key();
if (enabled_filaments.find(filament_name) != enabled_filaments.end())
m_ProfileJson["filament"][filament_name]["selected"] = 1;
else {
// Orca: Support renamed filament
json temp_filament = it.value();
if (enabled_filaments.find(temp_filament["name"]) != enabled_filaments.end())
m_ProfileJson["filament"][filament_name]["selected"] = 1;
else if (temp_filament.contains("renamed_from")) {
std::vector<std::string> renamed_from;
if (unescape_strings_cstyle(temp_filament["renamed_from"], renamed_from)) {
if (std::any_of(renamed_from.begin(), renamed_from.end(), [&enabled_filaments](const std::string& n) {
return enabled_filaments.find(n) != enabled_filaments.end();
})) {
m_ProfileJson["filament"][filament_name]["selected"] = 1;
}
}
}
}
}
//----region
@ -1332,6 +1347,11 @@ int GuideFrame::LoadProfileFamily(std::string strVendor, std::string strFilePath
}
}
OneFF["name"] = pm["name"];
if (pm.contains("renamed_from")) {
OneFF["renamed_from"] = pm["renamed_from"];
}
OneFF["models"] = ModelList;
OneFF["selected"] = 0;