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

ENH: config: add local logic into config.load

Browse source 
JIRA: github-2569
Change-Id: If593b9faee324dda096a27873587db27aa22129e
This commit is contained in:
lane.wei 2023-09-23 15:20:56 +08:00 • committed by Lane.Wei
parent 5250dc6fa6
commit 3b9d61cfc0
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libslic3r/Config.cpp
View file

@ -753,6 +753,9 @@ int ConfigBase::load_from_json(const std::string &file, ConfigSubstitutionContex
std::list<std::string> different_settings_append; std::list<std::string> different_settings_append;
std::string new_support_style; std::string new_support_style;
bool is_project_settings = false; bool is_project_settings = false;
CNumericLocalesSetter locales_setter;
try { try {
boost::nowide::ifstream ifs(file); boost::nowide::ifstream ifs(file);
ifs >> j; ifs >> j;

1
src/libslic3r/PresetBundle.cpp
View file

@ -2729,7 +2729,6 @@ void PresetBundle::load_config_file_config(const std::string &name_or_path, bool
std::pair<PresetsConfigSubstitutions, size_t> PresetBundle::load_vendor_configs_from_json( std::pair<PresetsConfigSubstitutions, size_t> PresetBundle::load_vendor_configs_from_json(
const std::string &path, const std::string &vendor_name, LoadConfigBundleAttributes flags, ForwardCompatibilitySubstitutionRule compatibility_rule) const std::string &path, const std::string &vendor_name, LoadConfigBundleAttributes flags, ForwardCompatibilitySubstitutionRule compatibility_rule)
{ {
CNumericLocalesSetter locales_setter;
// Enable substitutions for user config bundle, throw an exception when loading a system profile. // Enable substitutions for user config bundle, throw an exception when loading a system profile.
ConfigSubstitutionContext substitution_context { compatibility_rule }; ConfigSubstitutionContext substitution_context { compatibility_rule };
PresetsConfigSubstitutions substitutions; PresetsConfigSubstitutions substitutions;