Merge remote-tracking branch 'remote/master' into SoftFever

# Conflicts:
#	src/libslic3r/Preset.cpp

src/libslic3r/PrintConfig.cpp

@@ -12,6 +12,35 @@
 
 #include <float.h>
 
+namespace {
+std::set<std::string> SplitStringAndRemoveDuplicateElement(const std::string &str, const std::string &separator)
+{
+    std::set<std::string> result;
+    if (str.empty()) return result;
+
+    std::string strs = str + separator;
+    size_t      pos;
+    size_t      size = strs.size();
+
+    for (int i = 0; i < size; ++i) {
+        pos = strs.find(separator, i);
+        if (pos < size) {
+            std::string sub_str = strs.substr(i, pos - i);
+            result.insert(sub_str);
+            i = pos + separator.size() - 1;
+        }
+    }
+
+    return result;
+}
+
+void ReplaceString(std::string &resource_str, const std::string &old_str, const std::string &new_str)
+{
+    std::string::size_type pos = 0;
+    while ((pos = resource_str.find(old_str)) != std::string::npos) { resource_str.replace(pos, old_str.length(), new_str); }
+}
+}
+
 namespace Slic3r {
 
 //! macro used to mark string used at localization,
@@ -204,6 +233,14 @@ static const t_config_enum_values s_keys_map_BrimType = {
 };
 CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(BrimType)
 
+// using 0,1,2 to compatible with old files
+static const t_config_enum_values s_keys_map_TimelapseType = {
+    {"0",       tlNone},
+    {"1",       tlSmooth},
+    {"2",       tlTraditional}
+};
+CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(TimelapseType)
+
 static const t_config_enum_values s_keys_map_DraftShield = {
     { "disabled", dsDisabled },
     { "limited",  dsLimited  },
@@ -571,7 +608,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("%");
     def->min = 0;
     def->max = 100;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionInts { 100 });
 
     def = this->add("overhang_fan_threshold", coEnums);
@@ -580,7 +617,7 @@ void PrintConfigDef::init_fff_params()
                      "Expressed as percentage which indicides how much width of the line without support from lower layer");
     def->sidetext = L("");
     def->enum_keys_map = &s_keys_map_OverhangFanThreshold;
-    def->mode = comDevelop;
+    def->mode = comAdvanced;
     def->enum_values.emplace_back("5%");
     def->enum_values.emplace_back("25%");
     def->enum_values.emplace_back("50%");
@@ -2130,16 +2167,24 @@ void PrintConfigDef::init_fff_params()
     def->mode = comSimple;
     def->set_default_value(new ConfigOptionBool(false));
 
-    def = this->add("timelapse_no_toolhead", coBool);
+    def = this->add("timelapse_type", coEnum);
     def->label = L("Timelapse");
-    def->tooltip = L("If enabled, a timelapse video will be generated for each print. "
-                     "After each layer is printed, the toolhead will move to the excess chute, "
-                     "and then a snapshot is taken with the chamber camera. "
+    def->tooltip = L("If smooth or traditional mode is selected, a timelapse video will be generated for each print. "
+                     "After each layer is printed, a snapshot is taken with the chamber camera. "
                      "All of these snapshots are composed into a timelapse video when printing completes. "
+                     "If smooth mode is selected, the toolhead will move to the excess chute after each layer is printed "
+                     "and then take a snapshot. "
                      "Since the melt filament may leak from the nozzle during the process of taking a snapshot, "
-                     "prime tower is required for nozzle priming.");
+                     "prime tower is required for smooth mode to wipe nozzle.");
+    def->enum_keys_map = &ConfigOptionEnum<TimelapseType>::get_enum_values();
+    def->enum_values.emplace_back("0");
+    def->enum_values.emplace_back("1");
+    def->enum_values.emplace_back("2");
+    def->enum_labels.emplace_back(L("None"));
+    def->enum_labels.emplace_back(L("Smooth"));
+    def->enum_labels.emplace_back(L("Traditional"));
     def->mode = comSimple;
-    def->set_default_value(new ConfigOptionBool(false));
+    def->set_default_value(new ConfigOptionEnum<TimelapseType>(tlNone));
 
     def = this->add("standby_temperature_delta", coInt);
     def->label = L("Temperature variation");
@@ -2184,6 +2229,16 @@ void PrintConfigDef::init_fff_params()
     def->mode = comDevelop;
     def->set_default_value(new ConfigOptionBool(false));
 
+    def = this->add("slice_closing_radius", coFloat);
+    def->label = L("Slice gap closing radius");
+    def->category = L("Quality");
+    def->tooltip = L("Cracks smaller than 2x gap closing radius are being filled during the triangle mesh slicing. "
+        "The gap closing operation may reduce the final print resolution, therefore it is advisable to keep the value reasonably low.");
+    def->sidetext = L("mm");
+    def->min = 0;
+    def->mode = comAdvanced;
+    def->set_default_value(new ConfigOptionFloat(0.049));
+
     def = this->add("enable_support", coBool);
     //BBS: remove material behind support
     def->label = L("Enable support");
@@ -2621,6 +2676,7 @@ void PrintConfigDef::init_fff_params()
     def->label = L("Wipe Distance");
     def->tooltip = L("Discribe how long the nozzle will move along the last path when retracting");
     def->sidetext = L("mm");
+    def->min = 0;
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionFloats { 2. });
 
@@ -3530,6 +3586,19 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
         opt_key = "compatible_process_expression_group";
     } else if (opt_key == "cooling") {
         opt_key = "slow_down_for_layer_cooling";
+    } else if (opt_key == "timelapse_no_toolhead") {
+        opt_key = "timelapse_type";
+    } else if (opt_key == "different_settings_to_system") {
+        std::string copy_value = value;
+        copy_value.erase(std::remove(copy_value.begin(), copy_value.end(), '\"'), copy_value.end()); // remove '"' in string
+        std::set<std::string> split_keys = SplitStringAndRemoveDuplicateElement(copy_value, ";");
+        for (std::string split_key : split_keys) {
+            std::string copy_key = split_key, copy_value = "";
+            handle_legacy(copy_key, copy_value);
+            if (copy_key != split_key) {
+                ReplaceString(value, split_key, copy_key);
+            }
+        }
     }
 
     // Ignore the following obsolete configuration keys:
@@ -3544,7 +3613,7 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
         , "support_sharp_tails","remove_small_overhangs", "support_with_sheath",
         "tree_support_branch_diameter_angle", "tree_support_collision_resolution",
         "small_perimeter_speed", "max_volumetric_speed", "max_print_speed",
-        "support_bottom_z_distance", "support_closing_radius", "slicing_mode", "slice_closing_radius",
+        "support_bottom_z_distance", "support_closing_radius", "slicing_mode",
         "remove_freq_sweep", "remove_bed_leveling", "remove_extrusion_calibration",
         "support_transition_line_width", "support_transition_speed", "bed_temperature", "bed_temperature_initial_layer",
         "can_switch_nozzle_type", "can_add_auxiliary_fan", "extra_flush_volume", "spaghetti_detector"
@@ -3655,9 +3724,12 @@ void DynamicPrintConfig::normalize_fdm(int used_filaments)
         ConfigOptionBool* islh_opt = this->option<ConfigOptionBool>("independent_support_layer_height", true);
         ConfigOptionBool* alh_opt = this->option<ConfigOptionBool>("adaptive_layer_height");
         ConfigOptionEnum<PrintSequence>* ps_opt = this->option<ConfigOptionEnum<PrintSequence>>("print_sequence");
-
-        if (used_filaments == 1 || ps_opt->value == PrintSequence::ByObject)
-            ept_opt->value = false;
+        
+        ConfigOptionEnum<TimelapseType> *timelapse_opt = this->option<ConfigOptionEnum<TimelapseType>>("timelapse_type");
+        if (timelapse_opt && timelapse_opt->value == TimelapseType::tlSmooth) {
+            if (used_filaments == 1 || ps_opt->value == PrintSequence::ByObject)
+                ept_opt->value = false;
+        }
 
         if (ept_opt->value) {
             if (islh_opt)