Fixed conflicts after merge with master

src/libslic3r/Preset.cpp

@@ -1365,9 +1365,10 @@ const std::vector<std::string>& PhysicalPrinter::printer_options()
             "print_host", 
             "printhost_apikey", 
             "printhost_cafile",
-            "authorization_type",
-            "login", 
-            "password"
+            "printhost_authorization_type",
+            // HTTP digest authentization (RFC 2617)
+            "printhost_user", 
+            "printhost_password"
         };
     }
     return s_opts;
@@ -1412,11 +1413,11 @@ const std::set<std::string>& PhysicalPrinter::get_preset_names() const
 
 bool PhysicalPrinter::has_empty_config() const 
 {
-    return  config.opt_string("print_host"      ).empty() && 
-            config.opt_string("printhost_apikey").empty() && 
-            config.opt_string("printhost_cafile").empty() && 
-            config.opt_string("login"           ).empty() && 
-            config.opt_string("password"        ).empty();
+    return  config.opt_string("print_host"        ).empty() && 
+            config.opt_string("printhost_apikey"  ).empty() && 
+            config.opt_string("printhost_cafile"  ).empty() && 
+            config.opt_string("printhost_user"    ).empty() && 
+            config.opt_string("printhost_password").empty();
 }
 
 void PhysicalPrinter::update_preset_names_in_config()
@@ -1441,7 +1442,7 @@ void PhysicalPrinter::save(const std::string& file_name_from, const std::string&
 
 void PhysicalPrinter::update_from_preset(const Preset& preset)
 {
-    config.apply_only(preset.config, printer_options(), false);
+    config.apply_only(preset.config, printer_options(), true);
     // add preset names to the options list
     auto ret = preset_names.emplace(preset.name);
     update_preset_names_in_config();
@@ -1476,8 +1477,8 @@ bool PhysicalPrinter::delete_preset(const std::string& preset_name)
     return preset_names.erase(preset_name) > 0;
 }
 
-PhysicalPrinter::PhysicalPrinter(const std::string& name, const Preset& preset) :
-    name(name)
+PhysicalPrinter::PhysicalPrinter(const std::string& name, const DynamicPrintConfig &default_config, const Preset& preset) :
+    name(name), config(default_config)
 {
     update_from_preset(preset);
 }
@@ -1514,6 +1515,13 @@ std::string PhysicalPrinter::get_preset_name(std::string name)
 
 PhysicalPrinterCollection::PhysicalPrinterCollection( const std::vector<std::string>& keys)
 {
+    // Default config for a physical printer containing all key/value pairs of PhysicalPrinter::printer_options().
+    for (const std::string &key : keys) {
+        const ConfigOptionDef *opt = print_config_def.get(key);
+        assert(opt);
+        assert(opt->default_value);
+        m_default_config.set_key_value(key, opt->default_value->clone());
+    }
 }
 
 // Load all printers found in dir_path.
@@ -1539,7 +1547,7 @@ void PhysicalPrinterCollection::load_printers(const std::string& dir_path, const
                 continue;
             }
             try {
-                PhysicalPrinter printer(name);
+                PhysicalPrinter printer(name, this->default_config());
                 printer.file = dir_entry.path().string();
                 // Load the preset file, apply preset values on top of defaults.
                 try {
@@ -1590,7 +1598,7 @@ void PhysicalPrinterCollection::load_printers_from_presets(PrinterPresetCollecti
                         new_printer_name = (boost::format("Printer %1%") % ++cnt).str();
 
                     // create new printer from this preset
-                    PhysicalPrinter printer(new_printer_name, preset);
+                    PhysicalPrinter printer(new_printer_name, this->default_config(), preset);
                     printer.loaded = true;
                     save_printer(printer);
                 }

src/libslic3r/Preset.hpp

@@ -460,8 +460,7 @@ private:
     // If a preset does not exist, an iterator is returned indicating where to insert a preset with the same name.
     std::deque<Preset>::iterator find_preset_internal(const std::string &name)
     {
-        Preset key(m_type, name);
-        auto it = std::lower_bound(m_presets.begin() + m_num_default_presets, m_presets.end(), key);
+        auto it = Slic3r::lower_bound_by_predicate(m_presets.begin() + m_num_default_presets, m_presets.end(), [&name](const auto& l) { return l.name < name;  });
         if (it == m_presets.end() || it->name != name) {
             // Preset has not been not found in the sorted list of non-default presets. Try the defaults.
             for (size_t i = 0; i < m_num_default_presets; ++ i)
@@ -539,9 +538,8 @@ namespace PresetUtils {
 class PhysicalPrinter
 {
 public:
-    PhysicalPrinter() {}
-    PhysicalPrinter(const std::string& name) : name(name){}
-    PhysicalPrinter(const std::string& name, const Preset& preset);
+    PhysicalPrinter(const std::string& name, const DynamicPrintConfig &default_config) : name(name), config(default_config) {}
+    PhysicalPrinter(const std::string& name, const DynamicPrintConfig &default_config, const Preset& preset);
     void set_name(const std::string &name);
 
     // Name of the Physical Printer, usually derived form the file name.
@@ -698,6 +696,8 @@ public:
     // Generate a file path from a profile name. Add the ".ini" suffix if it is missing.
     std::string     path_from_name(const std::string& new_name) const;
 
+    const DynamicPrintConfig& default_config() const { return m_default_config; }
+
 private:
     PhysicalPrinterCollection& operator=(const PhysicalPrinterCollection& other);
 
@@ -707,9 +707,7 @@ private:
     // If a preset does not exist, an iterator is returned indicating where to insert a preset with the same name.
     std::deque<PhysicalPrinter>::iterator find_printer_internal(const std::string& name)
     {
-        PhysicalPrinter printer(name);
-        auto it = std::lower_bound(m_printers.begin(), m_printers.end(), printer);
-        return it;
+        return Slic3r::lower_bound_by_predicate(m_printers.begin(), m_printers.end(), [&name](const auto& l) { return l.name < name;  });
     }
     std::deque<PhysicalPrinter>::const_iterator find_printer_internal(const std::string& name) const
     {
@@ -723,6 +721,9 @@ private:
     // so that the addresses of the presets don't change during resizing of the container.
     std::deque<PhysicalPrinter> m_printers;
 
+    // Default config for a physical printer containing all key/value pairs of PhysicalPrinter::printer_options().
+    DynamicPrintConfig          m_default_config;
+
     // Selected printer.
     size_t                      m_idx_selected = size_t(-1);
     // The name of the preset which is currently select for this printer

src/libslic3r/PrintConfig.cpp

@@ -133,13 +133,13 @@ void PrintConfigDef::init_common_params()
 
     // Options used by physical printers
     
-    def = this->add("login", coString);
-    def->label = L("Login");
+    def = this->add("printhost_user", coString);
+    def->label = L("User");
 //    def->tooltip = L("");
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionString(""));
     
-    def = this->add("password", coString);
+    def = this->add("printhost_password", coString);
     def->label = L("Password");
 //    def->tooltip = L("");
     def->mode = comAdvanced;
@@ -151,7 +151,7 @@ void PrintConfigDef::init_common_params()
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionString(""));
 
-    def = this->add("authorization_type", coEnum);
+    def = this->add("printhost_authorization_type", coEnum);
     def->label = L("Authorization Type");
 //    def->tooltip = L("");
     def->enum_keys_map = &ConfigOptionEnum<AuthorizationType>::get_enum_values();