3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -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

4
xs/src/slic3r/GUI/PresetBundle.hpp
View file

@ -116,10 +116,12 @@ public:
// preset if the current print or filament preset is not compatible.
void update_compatible_with_printer(bool select_other_if_incompatible);
static bool parse_color(const std::string &scolor, unsigned char *rgb_out);
static bool parse_color(const std::string &scolor, unsigned char *rgb_out);
private:
std::string load_system_presets();
// Merge one vendor's presets with the other vendor's presets, report duplicates.
std::vector<std::string> merge_presets(PresetBundle &&other);
// Set the "enabled" flag for printer vendors, printer models and printer variants
// based on the user configuration.