juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-04 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: [STUDIO-4029] sync printer config with cloud

Browse Source 
Change-Id: Icffee9d5987131e1d78d51ccfcafeefff18f26cb
Jira: STUDIO-4029
(cherry picked from commit 5b58e5f2658753efbf11037f0b6cbb023070c0ea)
This commit is contained in:
chunmao.guo
2023-08-16 15:38:16 +08:00
committed by Lane.Wei
parent 11f0fb6016
commit 042e6bf991
8 changed files with 186 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/Utils/json_diff.cpp
View File

@@ -75,21 +75,24 @@ int json_diff::all2diff_base_reset(json const &base)
bool json_diff::load_compatible_settings(std::string const &type, std::string const &version)
{
std::string type2 = type.empty() ? printer_type : type;
std::string version2 = version.empty() ? printer_version : version;
if (type2 == printer_type && version2 == printer_version)
return false;
printer_type = type2;
printer_version = version2;
// Reload on empty type and version
if (!type.empty() || !version.empty()) {
std::string type2 = type.empty() ? printer_type : type;
std::string version2 = version.empty() ? printer_version : version;
if (type2 == printer_type && version2 == printer_version)
return false;
printer_type = type2;
printer_version = version2;
}
settings_base.clear();
std::string config_file = Slic3r::resources_dir() + "/printers/" + type2 + ".json";
std::string config_file = Slic3r::data_dir() + "/printers/" + printer_type + ".json";
boost::nowide::ifstream json_file(config_file.c_str());
try {
json versions;
if (json_file.is_open()) {
json_file >> versions;
for (auto iter = versions.begin(); iter != versions.end(); ++iter) {
if (iter.key() > version2)
if (iter.key() > printer_version)
break;
merge_objects(*iter, settings_base);
}