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

FIX: save and restore filament colors and flush volumes

Browse source 
Change-Id: I04b80d95e6a3e23ef3561e512673ea39dfc3ff0c
This commit is contained in:
chunmao.guo 2022-10-27 13:23:26 +08:00 • committed by Lane.Wei
parent 8be11c8688
commit 711f5906b9
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/AppConfig.cpp
View file

@ -458,8 +458,6 @@ std::string AppConfig::load()
} else if (it.key() == "presets") {
for (auto iter = it.value().begin(); iter != it.value().end(); iter++) {
if (iter.key() == "filaments") {
// BBS: filament presets is now considered as project config instead of app config
#if 0
int idx = 0;
for(auto& element: iter.value()) {
if (idx == 0)
@ -468,7 +466,6 @@ std::string AppConfig::load()
m_storage[it.key()]["filament_" + std::to_string(idx)] = element;
idx++;
}
#endif
} else {
m_storage[it.key()][iter.key()] = iter.value().get<std::string>();
}
@ -598,7 +595,7 @@ void AppConfig::save()
} else if (category.first == "presets") {
json j_filament_array;
for(const auto& kvp : category.second) {
if (boost::starts_with(kvp.first, "filament")) {
if (boost::starts_with(kvp.first, "filament") && kvp.first != "filament_colors") {
j_filament_array.push_back(kvp.second);
} else {
j[category.first][kvp.first] = kvp.second;