Merge remote-tracking branch 'origin/ys_add_new_options' into ys_improvements

1 files changed, 21 insertions, 2 deletions

diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 9e49dc5bd..7a8a4579e 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1100,6 +1100,12 @@ void Tab::update_frequently_changed_parameters()
     }
 }
 
+void Tab::update_sliced_info_on_plater()
+{
+    wxGetApp().sidebar().update_sliced_info_sizer();
+    wxGetApp().sidebar().Layout();
+}
+
 void TabPrint::build()
 {
     m_presets = &m_preset_bundle->prints;
@@ -1172,6 +1178,7 @@ void TabPrint::build()
         optgroup->append_single_option_line("skirts");
         optgroup->append_single_option_line("skirt_distance");
         optgroup->append_single_option_line("skirt_height");
+        optgroup->append_single_option_line("infinit_skirt");
         optgroup->append_single_option_line("min_skirt_length");
 
         optgroup = page->new_optgroup(_(L("Brim")));
@@ -1484,6 +1491,19 @@ void TabFilament::build()
         optgroup->append_single_option_line("extrusion_multiplier");
         optgroup->append_single_option_line("filament_density");
         optgroup->append_single_option_line("filament_cost");
+        optgroup->append_single_option_line("filament_spool_weight");
+
+        optgroup->m_on_change = [this, optgroup](t_config_option_key opt_key, boost::any value)
+        {
+            update_dirty();
+
+            if (opt_key== "filament_spool_weight")
+                // Change of this option only has an influence to an update of "Sliced Info"
+                update_sliced_info_on_plater();
+            else
+                // update configuration for its check and to schedule a background process, if needed
+                update();
+        };
 
         optgroup = page->new_optgroup(_(L("Temperature")) + wxString(" °C", wxConvUTF8));
         Line line = { _(L("Extruder")), "" };
@@ -3567,8 +3587,7 @@ void TabSLAMaterial::build()
         update_dirty();
 
         // Change of any from those options influences for an update of "Sliced Info"
-        wxGetApp().sidebar().update_sliced_info_sizer();
-        wxGetApp().sidebar().Layout();
+        update_sliced_info_on_plater();
     };
 
     optgroup = page->new_optgroup(_(L("Layers")));