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

Implemented merging of system profiles from various vendors.

Browse source
This commit is contained in:
bubnikv 2018-04-18 13:35:51 +02:00
parent 0711f84ea0
commit fa97a86751
4 changed files with 61 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xs/src/slic3r/GUI/Preset.hpp
View file

@ -336,6 +336,9 @@ protected:
// This is a temporary state, which shall be fixed immediately by the following step.
bool select_preset_by_name_strict(const std::string &name);
// Merge one vendor's presets with the other vendor's presets, report duplicates.
std::vector<std::string> merge_presets(PresetCollection &&other, const std::set<VendorProfile> &new_vendors);
private:
PresetCollection();
PresetCollection(const PresetCollection &other);