3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented loading of a Slic3r Config Bundle as a Slic3r Config file.

Browse Source
This commit is contained in:
bubnikv 2017-11-28 11:57:33 +01:00
parent 3c0cd3cbc8
commit f58b217369
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
xs/src/slic3r/GUI/PresetBundle.cpp
View File

@ -336,24 +336,47 @@ void PresetBundle::load_config_file_config_bundle(const std::string &path, const
// 1) Load the config bundle into a temp data. // 1) Load the config bundle into a temp data.
PresetBundle tmp_bundle; PresetBundle tmp_bundle;
tmp_bundle.load_configbundle(path); tmp_bundle.load_configbundle(path);
std::string bundle_name = std::string(" - ") + boost::filesystem::path(path).filename().string();
// 2) Extract active configs from the config bundle, copy them and activate them in this bundle. // 2) Extract active configs from the config bundle, copy them and activate them in this bundle.
if (tmp_bundle.prints.get_selected_preset().is_default) auto load_one = [this, &path, &bundle_name](PresetCollection &collection_dst, PresetCollection &collection_src, const std::string &preset_name_src, bool activate) -> std::string {
this->prints.select_preset(0); Preset *preset_src = collection_src.find_preset(preset_name_src, false);
else { Preset *preset_dst = collection_dst.find_preset(preset_name_src, false);
std::string new_name = tmp_bundle.prints.get_selected_preset().name; assert(preset_src != nullptr);
Preset *existing = this->prints.find_preset(new_name, false); std::string preset_name_dst;
if (existing == nullptr) { if (preset_dst != nullptr && preset_dst->is_default) {
// Save under the new_name. // No need to copy a default preset, it always exists in collection_dst.
} else if (existing->config == tmp_bundle.prints.get_selected_preset().config) { if (activate)
collection_dst.select_preset(0);
return preset_name_src;
} else if (preset_dst != nullptr && preset_src->config == preset_dst->config) {
// Don't save as the config exists in the current bundle and its content is the same. // Don't save as the config exists in the current bundle and its content is the same.
new_name.clear(); return preset_name_src;
} else { } else {
// Generate a new unique name. // Generate a new unique name.
preset_name_dst = preset_name_src + bundle_name;
Preset *preset_dup = nullptr;
for (size_t i = 1; (preset_dup = collection_dst.find_preset(preset_name_dst, false)) != nullptr; ++ i) {
if (preset_src->config == preset_dup->config)
// The preset has been already copied into collection_dst.
return preset_name_dst;
// Try to generate another name.
char buf[64];
sprintf(buf, " (%d)", i);
preset_name_dst = preset_name_src + buf + bundle_name;
} }
if (! new_name.empty())
this->prints.load_preset(path, new_name, std::move(tmp_bundle.prints.get_selected_preset().config));
} }
assert(! preset_name_dst.empty());
// Save preset_src->config into collection_dst under preset_name_dst.
collection_dst.load_preset(path, preset_name_dst, std::move(preset_src->config), activate).is_external = true;
return preset_name_dst;
};
load_one(this->prints, tmp_bundle.prints, tmp_bundle.prints .get_selected_preset().name, true);
load_one(this->filaments, tmp_bundle.filaments, tmp_bundle.filaments.get_selected_preset().name, true);
load_one(this->printers, tmp_bundle.printers, tmp_bundle.printers .get_selected_preset().name, true);
this->update_multi_material_filament_presets();
for (size_t i = 1; i < std::min(tmp_bundle.filament_presets.size(), this->filament_presets.size()); ++ i)
this->filament_presets[i] = load_one(this->filaments, tmp_bundle.filaments, tmp_bundle.filament_presets[i], false);
} }
// Load a config bundle file, into presets and store the loaded presets into separate files // Load a config bundle file, into presets and store the loaded presets into separate files