From 2b5689e4e6f413f6fc71e84f035a1080bc430433 Mon Sep 17 00:00:00 2001
From: supermerill <merill@free.fr>
Date: Thu, 14 May 2020 00:22:31 +0200
Subject: [PATCH] #226 extra wipe: filament override

---
 src/libslic3r/PrintConfig.cpp | 4 +++-
 src/slic3r/GUI/Preset.cpp     | 2 +-
 src/slic3r/GUI/Tab.cpp        | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 35d061475..a8d0df194 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -3355,6 +3355,7 @@ void PrintConfigDef::init_fff_params()
     for (const char *opt_key : {
         // floats
         "retract_length", "retract_lift", "retract_lift_above", "retract_lift_below", "retract_speed", "deretract_speed", "retract_restart_extra", "retract_before_travel",
+        "wipe_extra_perimeter",
         // bools
         "retract_layer_change", "wipe",
         // percents
@@ -3414,7 +3415,8 @@ void PrintConfigDef::init_extruder_option_keys()
         "retract_lift_below",
         "retract_restart_extra",
         "retract_speed",
-        "wipe"
+        "wipe",
+        "wipe_extra_perimeter"
     };
     assert(std::is_sorted(m_extruder_retract_keys.begin(), m_extruder_retract_keys.end()));
 }
diff --git a/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp
index c63900291..a0dc06a35 100644
--- a/src/slic3r/GUI/Preset.cpp
+++ b/src/slic3r/GUI/Preset.cpp
@@ -551,7 +551,7 @@ const std::vector<std::string>& Preset::filament_options()
         "start_filament_gcode", "end_filament_gcode",
         // Retract overrides
         "filament_retract_length", "filament_retract_lift", "filament_retract_lift_above", "filament_retract_lift_below", "filament_retract_speed", "filament_deretract_speed", "filament_retract_restart_extra", "filament_retract_before_travel",
-        "filament_retract_layer_change", "filament_wipe", "filament_retract_before_wipe",
+        "filament_retract_layer_change", "filament_wipe", "filament_wipe_extra_perimeter", "filament_retract_before_wipe",
         // Profile compatibility
         "filament_vendor", "compatible_prints", "compatible_prints_condition", "compatible_printers", "compatible_printers_condition", "inherits"
         //merill adds
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index a382d627d..24b2530ca 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1986,6 +1986,7 @@ void TabFilament::add_filament_overrides_page()
                                         "filament_retract_before_travel",
                                         "filament_retract_layer_change",
                                         "filament_wipe",
+                                        "filament_wipe_extra_perimeter",
                                         "filament_retract_before_wipe"
                                      })
         append_single_option_line(opt_key, extruder_idx);
@@ -2013,6 +2014,7 @@ void TabFilament::update_filament_overrides_page()
                                             "filament_retract_before_travel",
                                             "filament_retract_layer_change",
                                             "filament_wipe",
+                                            "filament_wipe_extra_perimeter",
                                             "filament_retract_before_wipe"
                                         };